Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth : fix for bluetooth turning on issue.(limit: 64times)"

Browse Source
This commit is contained in:
Jaikumar Ganesh
2011-08-10 10:10:49 -07:00
committed by Android (Google) Code Review
parent cd7f0d7f72 5ec09727f4
commit aae7a3d1fb
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/android_server_BluetoothEventLoop.cpp
View File

@@ -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;