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

Commit 78407171 authored by Rahul Sabnis's avatar Rahul Sabnis
Browse files

LEA developer option is enabled if the BT LEA flag is enabled 

Bug: 281568856
Test: Manual
Change-Id: If59afff53c304e38074d7a9999329dc039d4cffb
parent 44a61343

src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java

+4 −1
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll 


    private static final String ENABLE_DUAL_MODE_AUDIO =

            "persist.bluetooth.enable_dual_mode_audio";

    private static final String CONFIG_LE_AUDIO_ENABLED_BY_DEFAULT = "le_audio_enabled_by_default";



    private LocalBluetoothManager mManager;

    private LocalBluetoothProfileManager mProfileManager;
@@ -99,7 +100,9 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll 
        mIsLeContactSharingEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_LE_AUDIO_CONTACT_SHARING_ENABLED, true);

        mIsLeAudioToggleEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, false);

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, false)

                || DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                CONFIG_LE_AUDIO_ENABLED_BY_DEFAULT, false);

        // Call refresh here even though it will get called later in onResume, to avoid the

        // list of switches appearing to "pop" into the page.

        refresh();

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

+6 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public class BluetoothLeAudioDeviceDetailsPreferenceController 
        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {



    private static final String PREFERENCE_KEY = "bluetooth_show_leaudio_device_details";

    private static final String CONFIG_LE_AUDIO_ENABLED_BY_DEFAULT = "le_audio_enabled_by_default";

    static int sLeAudioSupportedStateCache = BluetoothStatusCodes.ERROR_UNKNOWN;



    @VisibleForTesting
@@ -87,8 +88,12 @@ public class BluetoothLeAudioDeviceDetailsPreferenceController 
        final boolean leAudioDeviceDetailEnabled = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, false);

        final boolean leAudioEnabledByDefault = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_BLUETOOTH, CONFIG_LE_AUDIO_ENABLED_BY_DEFAULT, false);



        ((SwitchPreference) mPreference).setChecked(leAudioDeviceDetailEnabled);

        mPreference.setEnabled(!leAudioEnabledByDefault);

        ((SwitchPreference) mPreference).setChecked(leAudioDeviceDetailEnabled

                || leAudioEnabledByDefault);

    }



    @Override