diff options
author | Jaikumar Ganesh <jaikumar@google.com> | 2011-08-10 10:10:49 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-10 10:10:49 -0700 |
commit | aae7a3d1fb7ea7e7f8c2317e8a51441d5c13f84f (patch) | |
tree | 292d4478befd58ec400bf567de2e6ed7367f4561 | |
parent | cd7f0d7f72b8b9cee2f1c92c11b82164620432c6 (diff) | |
parent | 5ec09727f44d7f284031e0cad2c96c21b2a8399e (diff) | |
download | frameworks_base-aae7a3d1fb7ea7e7f8c2317e8a51441d5c13f84f.zip frameworks_base-aae7a3d1fb7ea7e7f8c2317e8a51441d5c13f84f.tar.gz frameworks_base-aae7a3d1fb7ea7e7f8c2317e8a51441d5c13f84f.tar.bz2 |
Merge "Bluetooth : fix for bluetooth turning on issue.(limit: 64times)"
-rw-r--r-- | core/jni/android_server_BluetoothEventLoop.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index 8f84b81..45b7f27 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -229,6 +229,13 @@ static jboolean setUpEventLoop(native_data_t *nat) { DBusError err; dbus_error_init(&err); + const char *agent_path = "/android/bluetooth/agent"; + const char *capabilities = "DisplayYesNo"; + if (register_agent(nat, agent_path, capabilities) < 0) { + dbus_connection_unregister_object_path (nat->conn, agent_path); + return JNI_FALSE; + } + // Add a filter for all incoming messages if (!dbus_connection_add_filter(nat->conn, event_filter, nat, NULL)){ return JNI_FALSE; @@ -294,12 +301,6 @@ static jboolean setUpEventLoop(native_data_t *nat) { return JNI_FALSE; } - const char *agent_path = "/android/bluetooth/agent"; - const char *capabilities = "DisplayYesNo"; - if (register_agent(nat, agent_path, capabilities) < 0) { - dbus_connection_unregister_object_path (nat->conn, agent_path); - return JNI_FALSE; - } return JNI_TRUE; } return JNI_FALSE; |