commit 363bd5554e83c29ecdf2ec762f719dea29ffa430
author Jaikumar Ganesh <jaikumar@google.com> Wed Sep 16 14:37:13 2009 -0700
committer Jaikumar Ganesh <jaikumar@google.com> Wed Sep 16 14:56:08 2009 -0700
tree 5f61af8d3d085dbd15e0d37a4681fef0fde792af
parent dd1bb33e017a10f800a6da37042a91859acf56e9

Fix string name for bluetooth pairing and fix NPE

Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c666871..1ea703c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -444,7 +444,7 @@
                   android:label="@string/bluetooth_connect_specific_profiles_title" />
 
         <activity android:name=".bluetooth.BluetoothPairingDialog"
-                  android:label="@string/bluetooth_pairing_dialog"
+                  android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Dialog.Alert">
             <intent-filter>

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

diff --git a/src/com/android/settings/bluetooth/LocalBluetoothManager.java b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
index 7037582..775b120 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
@@ -256,7 +256,8 @@
         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);
             }