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

Commit 7ecc4174 authored by Ajay Panicker's avatar Ajay Panicker
Browse files

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

Bug: 30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c
parent 9220ff1f

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

        }