diff options
| author | Ron Shaffer <rshaffer@quicinc.com> | 2010-04-22 15:11:25 -0400 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-08-15 07:21:47 -0400 |
| commit | 85905c7e1f987db174167f575b65ab92eaf2dfb1 (patch) | |
| tree | 1e516218e2537409f4e3bed0b51cf2eb99e4897e | |
| parent | f7d4597aa5ec2f3cd83caa34958a204e34445c52 (diff) | |
| download | frameworks_base-85905c7e1f987db174167f575b65ab92eaf2dfb1.zip frameworks_base-85905c7e1f987db174167f575b65ab92eaf2dfb1.tar.gz frameworks_base-85905c7e1f987db174167f575b65ab92eaf2dfb1.tar.bz2 | |
Bluetooth: Change typos in calls to remove D-Bus filter rules
During Bluetooth eventloop teardown, the strings used in calls to remove the
D-Bus filter rules were incorrect. This leaves rules assigned to the connection,
and eventually the maximum number of rules are exceeded preventing Bluetooth
from being enabled.
Change-Id: I406345a510677ee34b4c67fffbb685b184b6b7fe
CRs-fixed: 235360
| -rw-r--r-- | core/jni/android_server_BluetoothEventLoop.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index 7c35ff4..4b9f14a 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -226,7 +226,7 @@ static jboolean setUpEventLoop(native_data_t *nat) { return JNI_FALSE; } dbus_bus_add_match(nat->conn, - "type='signal',interface='org.bluez.AudioSink'", + "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".AudioSink'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); @@ -382,19 +382,13 @@ static void tearDownEventLoop(native_data_t *nat) { dbus_connection_unregister_object_path(nat->conn, agent_path); dbus_bus_remove_match(nat->conn, - "type='signal',interface='org.bluez.AudioSink'", + "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".AudioSink'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); } dbus_bus_remove_match(nat->conn, - "type='signal',interface='org.bluez.audio.Device'", - &err); - if (dbus_error_is_set(&err)) { - LOG_AND_FREE_DBUS_ERROR(&err); - } - dbus_bus_remove_match(nat->conn, - "type='signal',interface='org.bluez.audio.Manager'", + "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Device'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); |