Fix string name for bluetooth pairing and fix NPE

Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1
2009-09-16 14:37:13 -07:00
parent dd1bb33e01
commit 363bd5554e
2 changed files with 3 additions and 2 deletions
--- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
@@ -256,7 +256,8 @@ public class LocalBluetoothManager {
        CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(device);
        String name = null;
        if (cachedDevice == null) {
-            name = device.getName();
+            if (device != null) name = device.getName();
+
            if (name == null) {
                name = mContext.getString(R.string.bluetooth_remote_device);
            }