summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jaikumar Ganesh <jaikumarg@android.com> 2011-05-20 13:37:00 -0700
committer Android Code Review <code-review@android.com> 2011-05-20 13:37:00 -0700
commit4b41df613db19c5fe1d8c0d05ef314326fd3f95b (patch)
treec3d3fde040603cf4cf297af85d8a1d284191c5cc
parent198ed3e46af4bd51fa6be0186bacdde9e832ba94 (diff)
parent75d14c33d795621988a1df173d3d69abe0b6c8f4 (diff)
Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
-rw-r--r--core/jni/android_server_BluetoothEventLoop.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp
index d8e049dd3be2..de003dfff9e5 100644
--- 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)) {