Merge "Fix a compile error when debug is turned on"

Matthew Xie · Android (Google) Code Review · commit 1667446c90d3 · 2011-09-12T18:30:48.000-07:00
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp
@@ -1562,8 +1562,8 @@ void onHealthDeviceConnectionResult(DBusMessage *msg, void *user, void *n) {
         LOG_AND_FREE_DBUS_ERROR(&err);
     }
 
-    LOGV("... Health Device Code = %d, result = %d", code, result);
     jint code = *(int *) user;
+    LOGV("... Health Device Code = %d, result = %d", code, result);
     env->CallVoidMethod(nat->me,
                         method_onHealthDeviceConnectionResult,
                         code,

Original file line number	Diff line number	Diff line change
`@@ -1562,8 +1562,8 @@ void onHealthDeviceConnectionResult(DBusMessage msg, void user, void *n) {`
`1562`	`1562`	`LOG_AND_FREE_DBUS_ERROR(&err);`
`1563`	`1563`	`}`
`1564`	`1564`
`1565`		`- LOGV("... Health Device Code = %d, result = %d", code, result);`
`1566`	`1565`	`jint code = (int ) user;`
	`1566`	`+ LOGV("... Health Device Code = %d, result = %d", code, result);`
`1567`	`1567`	`env->CallVoidMethod(nat->me,`
`1568`	`1568`	`method_onHealthDeviceConnectionResult,`
`1569`	`1569`	`code,`