Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87d114ac authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

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

am: d4963e80

Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225
parents 0e068f63 d4963e80

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public final class CachedBluetoothDeviceManager { 
     */

    public String getName(BluetoothDevice device) {

        CachedBluetoothDevice cachedDevice = findDevice(device);

        if (cachedDevice != null) {

        if (cachedDevice != null && cachedDevice.getName() != null) {

            return cachedDevice.getName();

        }