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

Merge change 3958

Browse Source 
* changes:
  Fix tearDown event loop - message unref, triggers when bluetoothd crashes.
This commit is contained in:
Android (Google) Code Review
2009-06-11 15:48:56 -07:00
parent c933fb663e 9b0fe60b88
commit 2fde0e640a
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/jni/android_server_BluetoothEventLoop.cpp
View File

@@ -294,23 +294,25 @@ static void tearDownEventLoop(native_data_t *nat) {
nat->adapter,
"org.bluez.Adapter",
"UnregisterAgent");
if (dbus_error_is_set(&err)) {
LOG_AND_FREE_DBUS_ERROR(&err);
dbus_error_free(&err);
if (msg != NULL) {
dbus_message_append_args(msg, DBUS_TYPE_OBJECT_PATH, &agent_path,
DBUS_TYPE_INVALID);
reply = dbus_connection_send_with_reply_and_block(nat->conn,
msg, -1, &err);
if (!reply) {
if (dbus_error_is_set(&err)) {
LOG_AND_FREE_DBUS_ERROR(&err);
dbus_error_free(&err);
}
} else {
dbus_message_unref(reply);
}
dbus_message_unref(msg);
} else {
LOGE("%s: Can't create new method call!", __FUNCTION__);
}
dbus_message_append_args(msg, DBUS_TYPE_OBJECT_PATH, &agent_path,
DBUS_TYPE_INVALID);
reply = dbus_connection_send_with_reply_and_block(nat->conn,
msg, -1, &err);
dbus_message_unref(msg);
if (!reply && dbus_error_is_set(&err)) {
LOG_AND_FREE_DBUS_ERROR(&err);
dbus_error_free(&err);
}
dbus_message_unref(reply);
dbus_connection_flush(nat->conn);
dbus_connection_unregister_object_path(nat->conn, agent_path);