commit c2c4efd13754930c372582a92afa6a778f6cef44
author Ajay Panicker <apanicke@google.com> Mon Apr 03 12:15:54 2017 -0700
committer Ajay Panicker <apanicke@google.com> Mon Apr 03 20:21:14 2017 +0000
tree 0121dc97bb0405f6e0aae66d520177fed6bffecd
parent 9a029b52625c3852f2b7628c208d57cf4f64b34e

Make sure that the device name is not null before returning it

Bug: 30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
index a9f4bd3..2adcdf3 100755
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
@@ -103,7 +103,7 @@
      */
     public String getName(BluetoothDevice device) {
         CachedBluetoothDevice cachedDevice = findDevice(device);
-        if (cachedDevice != null) {
+        if (cachedDevice != null && cachedDevice.getName() != null) {
             return cachedDevice.getName();
         }