diff options
| author | Michael Chan <mchan@android.com> | 2009-12-10 23:08:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 23:08:40 -0800 |
| commit | 38badc8ba086febc93a905de91dccefa03cc1aae (patch) | |
| tree | 99643284c59f5d2aea2d514f25a2d2ec18ceffa0 /src/com/android/settings/bluetooth | |
| parent | bd0b2542a848bb6cd5a6055ee870a63732ae061d (diff) | |
| parent | 9463c2f8d5f09ef9cc015405640bbf845f0f7a8a (diff) | |
| download | packages_apps_settings-38badc8ba086febc93a905de91dccefa03cc1aae.zip packages_apps_settings-38badc8ba086febc93a905de91dccefa03cc1aae.tar.gz packages_apps_settings-38badc8ba086febc93a905de91dccefa03cc1aae.tar.bz2 | |
am 9463c2f8: b/2320107 NPE when receiving a Undock event without a device
Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-mr2
* commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
b/2320107 NPE when receiving a Undock event without a device
Diffstat (limited to 'src/com/android/settings/bluetooth')
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothEventRedirector.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java index f283a67..c1a2116 100644 --- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java +++ b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java @@ -131,7 +131,7 @@ public class BluetoothEventRedirector { int anythingButUnDocked = Intent.EXTRA_DOCK_STATE_UNDOCKED + 1; int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, anythingButUnDocked); if (state == Intent.EXTRA_DOCK_STATE_UNDOCKED) { - if (device.getBondState() == BluetoothDevice.BOND_NONE) { + if (device != null && device.getBondState() == BluetoothDevice.BOND_NONE) { mManager.getCachedDeviceManager().onDeviceDisappeared(device); } } |