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

Commit d4963e80 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 9a029b52 c2c4efd1

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

        }