revert r2919 from stable

git-svn-id: http://webrtc.googlecode.com/svn/stable/src@2949 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/video_engine/test/android/jni/vie_android_java_api.cc b/video_engine/test/android/jni/vie_android_java_api.cc
index 3e14364..3443a3e 100644
--- a/video_engine/test/android/jni/vie_android_java_api.cc
+++ b/video_engine/test/android/jni/vie_android_java_api.cc
@@ -974,9 +974,14 @@
   if (NULL == vieData.rtp)
     return -1;
 
+  if (enable)
+    __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG,
+                            "EnableNACK enable");
+  else
+    __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG,
+                            "EnableNACK disable");
+
   int ret = vieData.rtp->SetNACKStatus(channel, enable);
-  __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG,
-                      "EnableNACK(%d) ret:%d", enable, ret);
   return ret;
 }
 
diff --git a/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java b/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java
index 57efe0a..9d94726 100644
--- a/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java
+++ b/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java
@@ -143,7 +143,7 @@
     private TextView etVTxPort;
     private int destinationPortVideo = 11111;
     private CheckBox cbEnableNack;
-    private boolean enableNack = true;
+    private boolean enableNack = false;
     private CheckBox cbEnableVideoRTPDump;
 
     // Audio settings
@@ -678,8 +678,9 @@
                 ret = ViEAndroidAPI.StartSend(channel);
             }
 
+            // TODO(leozwang): Add more options besides PLI, currently use pli
+            // as the default. Also check return value.
             ret = ViEAndroidAPI.EnablePLI(channel, true);
-            ret = ViEAndroidAPI.EnableNACK(channel, enableNack);
             ret = ViEAndroidAPI.SetCallback(channel, this);
 
             if (enableVideoSend) {