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

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

Merge "Bluetooth: fix NullPointerException during bluetooth turning off" into main

parents e27e15d3 9bcda48f

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

+2 −2
Original line number Diff line number Diff line
@@ -294,8 +294,8 @@ public class BluetoothUtils { 
     */

    public static boolean isDeviceClassMatched(@NonNull BluetoothDevice bluetoothDevice,

            int device) {

        return bluetoothDevice.getBluetoothClass() != null

                && bluetoothDevice.getBluetoothClass().getDeviceClass() == device;

        final BluetoothClass bluetoothClass = bluetoothDevice.getBluetoothClass();

        return bluetoothClass != null && bluetoothClass.getDeviceClass() == device;

    }



    private static boolean isAdvancedHeaderEnabled() {