From 9463c2f8d5f09ef9cc015405640bbf845f0f7a8a Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@android.com>
Date: Thu, 10 Dec 2009 22:53:14 -0800
Subject: [PATCH] b/2320107 NPE when receiving a Undock event without a device

Change-Id: Ic3c964f2d58462a1b7c82f2de2dd997679f90ba7
---
 .../android/settings/bluetooth/BluetoothEventRedirector.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
index f283a67d58f..c1a2116023a 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);
                     }
                 }