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

Commit 70b3e387 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:... 

Merge "Make sure that the device name is not null before returning it" am: d4963e80 am: 87d114ac
am: c6438a68

Change-Id: I90c31e9f1c304d6696908d3518c3e96940fea8f6
parents dbcf5279 c6438a68

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

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

    public String getName(BluetoothDevice device) {

        CachedBluetoothDevice cachedDevice = findDevice(device);

        if (cachedDevice != null) {

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

            return cachedDevice.getName();

        }