commit cce52bd3a5162326493e4374c9ddc4f333351da7
author Matthew Xie <mattx@google.com> Mon Sep 10 12:53:51 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 10 12:53:51 2012 -0700
tree b7cbf0218c0d5adde088d24165c430d95e2e5144
parent de101033025c53ab8f16c31c57c003c757e47cec
parent 40b77fe04b2fc37b7f98b35fe9cf8ae54931dd1d

Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev

src/com/android/settings/bluetooth/BluetoothPermissionActivity.java

diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
old mode 100644
new mode 100755
index 4fd6cee..16476fa
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -251,6 +251,13 @@
         CachedBluetoothDeviceManager cachedDeviceManager =
             bluetoothManager.getCachedDeviceManager();
         CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
-        cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        if (cachedDevice != null ) {
+            cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        } else {
+            cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
+                                                         bluetoothManager.getProfileManager(),
+                                                         mDevice);
+            cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        }
     }
 }