diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-07-15 16:00:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-15 16:00:02 -0700 |
| commit | 28a8467e51d052e1b3c52ba414633601e47e7530 (patch) | |
| tree | bf03f05850527ed4f04442216df9df44f415f222 /core | |
| parent | 51b7ebc652e320ee89b546f3e699ba31e9394a2c (diff) | |
| parent | 56d26139659c2414d289194c63860ff27ab80da0 (diff) | |
| download | frameworks_base-28a8467e51d052e1b3c52ba414633601e47e7530.zip frameworks_base-28a8467e51d052e1b3c52ba414633601e47e7530.tar.gz frameworks_base-28a8467e51d052e1b3c52ba414633601e47e7530.tar.bz2 | |
Merge "Handle Input and network signal changes for HID and tethering."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/server/BluetoothService.java | 4 | ||||
| -rw-r--r-- | core/jni/android_server_BluetoothEventLoop.cpp | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index ec99b0d..23219a3 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -1340,9 +1340,7 @@ public class BluetoothService extends IBluetooth.Stub { } - /*package*/ void handleInputDevicePropertyChange(String path, boolean connected) { - String address = getAddressFromObjectPath(path); - if (address == null) return; + /*package*/ void handleInputDevicePropertyChange(String address, boolean connected) { int state = connected ? BluetoothInputDevice.STATE_CONNECTED : BluetoothInputDevice.STATE_DISCONNECTED; BluetoothDevice device = mAdapter.getRemoteDevice(address); diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index 3c88158..efaff12 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -231,6 +231,20 @@ static jboolean setUpEventLoop(native_data_t *nat) { return JNI_FALSE; } dbus_bus_add_match(nat->conn, + "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Input'", + &err); + if (dbus_error_is_set(&err)) { + LOG_AND_FREE_DBUS_ERROR(&err); + return JNI_FALSE; + } + dbus_bus_add_match(nat->conn, + "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Network'", + &err); + if (dbus_error_is_set(&err)) { + LOG_AND_FREE_DBUS_ERROR(&err); + return JNI_FALSE; + } + dbus_bus_add_match(nat->conn, "type='signal',interface='org.bluez.AudioSink'", &err); if (dbus_error_is_set(&err)) { |