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

Commit 6190b5eb authored by Yuanru Qian's avatar Yuanru Qian Committed by Automerger Merge Worker
Browse files

Merge "Developer option crashed when Bluetooth feature disabled" into main am: cff856a8 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3172099



Change-Id: Idaa295aa767f900acc88da42bc838b7081c69504
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97f922d6 cff856a8

src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java

+4 −3
Original line number Diff line number Diff line
@@ -45,10 +45,11 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceController extends 
        super(context);



        final BluetoothManager bluetoothManager = context.getSystemService(BluetoothManager.class);



        if(bluetoothManager != null && bluetoothManager.getAdapter() != null) {

            mDefaultMaxConnectedAudioDevices =

                bluetoothManager.getAdapter().getMaxConnectedAudioDevices();

        }

    }



    @Override

    public String getPreferenceKey() {