Merge "Fix build warnings"

gkasten · Android (Google) Code Review · commit 7c0f2824f2f9 · 2012-01-17T14:41:28.000-08:00
diff --git a/voip/jni/rtp/AudioGroup.cpp b/voip/jni/rtp/AudioGroup.cpp
@@ -1008,7 +1008,7 @@ void add(JNIEnv *env, jobject thiz, jint mode,
     delete stream;
     delete codec;
     close(socket);
-    env->SetIntField(thiz, gNative, NULL);
+    env->SetIntField(thiz, gNative, 0);
 }
 
 void remove(JNIEnv *env, jobject thiz, jint socket)
@@ -1017,7 +1017,7 @@ void remove(JNIEnv *env, jobject thiz, jint socket)
     if (group) {
         if (socket == -1 || !group->remove(socket)) {
             delete group;
-            env->SetIntField(thiz, gNative, NULL);
+            env->SetIntField(thiz, gNative, 0);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1008,7 +1008,7 @@ void add(JNIEnv *env, jobject thiz, jint mode,`
`1008`	`1008`	`delete stream;`
`1009`	`1009`	`delete codec;`
`1010`	`1010`	`close(socket);`
`1011`		`- env->SetIntField(thiz, gNative, NULL);`
	`1011`	`+ env->SetIntField(thiz, gNative, 0);`
`1012`	`1012`	`}`
`1013`	`1013`
`1014`	`1014`	`void remove(JNIEnv *env, jobject thiz, jint socket)`
`@@ -1017,7 +1017,7 @@ void remove(JNIEnv *env, jobject thiz, jint socket)`
`1017`	`1017`	`if (group) {`
`1018`	`1018`	`if (socket == -1 \|\| !group->remove(socket)) {`
`1019`	`1019`	`delete group;`
`1020`		`- env->SetIntField(thiz, gNative, NULL);`
	`1020`	`+ env->SetIntField(thiz, gNative, 0);`
`1021`	`1021`	`}`
`1022`	`1022`	`}`
`1023`	`1023`	`}`