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

Commit a309d942 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Bluetooth: fix NullPointerException during bluetooth turning off" into main am: e20017d5 am: 8a5ff60e am: 5cbd060f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2707194



Change-Id: I0411ec9813ccf4c3cc856074d2b34f0256fbf822
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54086d73 5cbd060f

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

+2 −2
Original line number Diff line number Diff line
@@ -307,8 +307,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() {