From 363bd5554e83c29ecdf2ec762f719dea29ffa430 Mon Sep 17 00:00:00 2001
From: Jaikumar Ganesh <jaikumar@google.com>
Date: Wed, 16 Sep 2009 14:37:13 -0700
Subject: [PATCH] Fix string name for bluetooth pairing and fix NPE

Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1
---
 AndroidManifest.xml                                           | 2 +-
 src/com/android/settings/bluetooth/LocalBluetoothManager.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c6668710ce2..1ea703caa84 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>
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothManager.java b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
index 70375821126..775b1208a03 100644
--- 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);
             }