diff options
| author | Jaikumar Ganesh <jaikumarg@android.com> | 2011-02-28 16:27:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-28 16:27:16 -0800 |
| commit | 516393faba128ce43bee98b6319e060744fe7be6 (patch) | |
| tree | b0e3e76050fd9ac00a93637299ff499d7bc4b04c | |
| parent | c01e201f12149ca96593af4e18133d3b2fce5546 (diff) | |
| parent | 9711b9b7aa7448b44b85fe8158ded0364cc3540e (diff) | |
| download | frameworks_base-516393faba128ce43bee98b6319e060744fe7be6.zip frameworks_base-516393faba128ce43bee98b6319e060744fe7be6.tar.gz frameworks_base-516393faba128ce43bee98b6319e060744fe7be6.tar.bz2 | |
am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
* commit '9711b9b7aa7448b44b85fe8158ded0364cc3540e':
Phone crash when old callback func is woken up when enabling BT.
| -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 80d6d30..568d465 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -593,6 +593,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); |