commit d4963e8035a1010847062b9ecdf5bd319f221f2f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 04 01:11:07 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 04 01:11:08 2017 +0000
tree 0121dc97bb0405f6e0aae66d520177fed6bffecd
parent 9a029b52625c3852f2b7628c208d57cf4f64b34e
parent c2c4efd13754930c372582a92afa6a778f6cef44

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

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();
         }