diff options
| author | Michael Chan <mchan@android.com> | 2009-12-11 12:23:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-11 12:23:37 -0800 |
| commit | 0a0225418366e4502e18e414e71a04d575b1a47e (patch) | |
| tree | 0bf7dddc8279cdd0f828c3b6c252d19c2a383614 | |
| parent | 362d5b17c0ff8f8f7207bbdec9c952d19c83b3be (diff) | |
| parent | 38badc8ba086febc93a905de91dccefa03cc1aae (diff) | |
| download | packages_apps_settings-0a0225418366e4502e18e414e71a04d575b1a47e.zip packages_apps_settings-0a0225418366e4502e18e414e71a04d575b1a47e.tar.gz packages_apps_settings-0a0225418366e4502e18e414e71a04d575b1a47e.tar.bz2 | |
am 38badc8b: am 9463c2f8: b/2320107 NPE when receiving a Undock event without a device
Merge commit '38badc8ba086febc93a905de91dccefa03cc1aae' into eclair-mr2-plus-aosp
* commit '38badc8ba086febc93a905de91dccefa03cc1aae':
b/2320107 NPE when receiving a Undock event without a device
| -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); } } |