diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-09-09 16:05:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 16:05:43 -0700 |
| commit | 41506304b86a9c9a605e8b96318e61f0f8f6a235 (patch) | |
| tree | 947ce4a206a2ede62c83744990a68a202b563ad5 | |
| parent | 91cf049f34b4f3d53d39e868104f11156a332b65 (diff) | |
| parent | 166aeb290be234531ba049b6702f558a02317393 (diff) | |
| download | frameworks_base-41506304b86a9c9a605e8b96318e61f0f8f6a235.zip frameworks_base-41506304b86a9c9a605e8b96318e61f0f8f6a235.tar.gz frameworks_base-41506304b86a9c9a605e8b96318e61f0f8f6a235.tar.bz2 | |
am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread
Merge commit '166aeb290be234531ba049b6702f558a02317393' into gingerbread-plus-aosp
* commit '166aeb290be234531ba049b6702f558a02317393':
DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
| -rw-r--r-- | core/jni/android_server_BluetoothEventLoop.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index 01b6711..db45d6d 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -388,7 +388,7 @@ static void tearDownEventLoop(native_data_t *nat) { LOG_AND_FREE_DBUS_ERROR(&err); } dbus_bus_remove_match(nat->conn, - "type='signal',interface='org.bluez.audio.Device'", + "type='signal',interface='org.bluez.Device'", &err); if (dbus_error_is_set(&err)) { LOG_AND_FREE_DBUS_ERROR(&err); |