Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."

Jaikumar Ganesh · Android Code Review · commit 4b41df613db1 · 2011-05-20T13:37:00.000-07:00
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp
@@ -311,7 +311,7 @@ static int register_agent(native_data_t *nat,
 {
     DBusMessage *msg, *reply;
     DBusError err;
-    bool oob = TRUE;
+    dbus_bool_t oob = TRUE;
 
     if (!dbus_connection_register_object_path(nat->conn, agent_path,
             &agent_vtable, nat)) {

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ static int register_agent(native_data_t *nat,`
`311`	`311`	`{`
`312`	`312`	`DBusMessage msg, reply;`
`313`	`313`	`DBusError err;`
`314`		`- bool oob = TRUE;`
	`314`	`+ dbus_bool_t oob = TRUE;`
`315`	`315`
`316`	`316`	`if (!dbus_connection_register_object_path(nat->conn, agent_path,`
`317`	`317`	`&agent_vtable, nat)) {`