summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jaikumar Ganesh <jaikumarg@android.com> 2011-05-20 14:21:29 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-20 14:21:29 -0700
commitd1735ef91af201ff140f8d954dd07eff80836d20 (patch)
tree856ae5891fac66368ecd236d0f6c18bbfc31ba92
parentd7030e551aa99ed9f533d46de5f3443ceb4c5703 (diff)
parent4b41df613db19c5fe1d8c0d05ef314326fd3f95b (diff)
am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
* commit '4b41df613db19c5fe1d8c0d05ef314326fd3f95b': 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)) {