diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-01-13 10:14:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-13 10:14:40 -0800 |
| commit | b54fd91d1b843b7742bf6396cefa6c63b14dc6df (patch) | |
| tree | c628dbc30d3a6b35bbbe1f3b5bd3dbfe72721185 | |
| parent | d88ad4ab49280a19da6582ba6e776c296be79ec0 (diff) | |
| parent | 81f8e3c85ff8d134fc21bd103145202ea7f78e49 (diff) | |
| download | frameworks_base-b54fd91d1b843b7742bf6396cefa6c63b14dc6df.zip frameworks_base-b54fd91d1b843b7742bf6396cefa6c63b14dc6df.tar.gz frameworks_base-b54fd91d1b843b7742bf6396cefa6c63b14dc6df.tar.bz2 | |
Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
| -rw-r--r-- | core/java/android/server/BluetoothEventLoop.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index 31bc3fc..539a696 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -717,6 +717,8 @@ class BluetoothEventLoop { private void onDiscoverServicesResult(String deviceObjectPath, boolean result) { String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath); + if (address == null) return; + // We don't parse the xml here, instead just query Bluez for the properties. if (result) { mBluetoothService.updateRemoteDevicePropertiesCache(address); |