diff --git a/webrtc/examples/android/media_demo/jni/video_engine_jni.cc b/webrtc/examples/android/media_demo/jni/video_engine_jni.cc
index 712e178665..c6589ece60 100644
--- a/webrtc/examples/android/media_demo/jni/video_engine_jni.cc
+++ b/webrtc/examples/android/media_demo/jni/video_engine_jni.cc
@@ -631,7 +631,8 @@ JOWW(jint, VideoEngine_setTraceFile)(JNIEnv* jni, jobject, jstring j_filename,
   return webrtc::VideoEngine::SetTraceFile(filename.c_str(), file_counter);
 }
 
-JOWW(jint, VideoEngine_setTraceFilter)(JNIEnv* jni, jobject, jint filter) {
+JOWW(jint, VideoEngine_nativeSetTraceFilter)(JNIEnv* jni, jobject,
+                                             jint filter) {
   return webrtc::VideoEngine::SetTraceFilter(filter);
 }
 
diff --git a/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/VideoEngine.java b/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/VideoEngine.java
index 885f88be2b..7cfa5856d7 100644
--- a/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/VideoEngine.java
+++ b/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/VideoEngine.java
@@ -29,7 +29,7 @@ public class VideoEngine {
     TRACE_DEBUG(0x0800),
     TRACE_INFO(0x1000),
     TRACE_TERSE_INFO(0x2000),
-    TRACE_ALL(0xfff);
+    TRACE_ALL(0xffff);
 
     public final int level;
     TraceLevel(int level) {
@@ -103,9 +103,9 @@ public class VideoEngine {
   public native int setTraceFile(String fileName,
       boolean fileCounter);
   public int setTraceFilter(TraceLevel filter) {
-    return filter.level;
+    return nativeSetTraceFilter(filter.level);
   }
-  private native int setTraceFilter(int filter);
+  private native int nativeSetTraceFilter(int filter);
   public int startRtpDump(int channel, String file,
       RtpDirections direction) {
     return startRtpDump(channel, file, direction.ordinal());