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

Commit e8b2b6cf authored by Yiyi Shen's avatar Yiyi Shen
Browse files

[Audiosharing] Do not auto pick fallback in UI when flag on 

Flag: com.android.settingslib.flags.disable_audio_sharing_auto_pick_fallback_in_ui
Bug: 383469911
Test: manual
Change-Id: I6a960c47a364a88cb23e7f837f566de977e17e01
parent 5359b6dc

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

+5 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import androidx.annotation.Nullable; 
import androidx.annotation.RequiresApi;



import com.android.settingslib.R;

import com.android.settingslib.flags.Flags;



import com.google.common.collect.ImmutableList;
@@ -1126,6 +1127,10 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 


    /** Update fallback active device if needed. */

    public void updateFallbackActiveDeviceIfNeeded() {

        if (Flags.disableAudioSharingAutoPickFallbackInUi()) {

            Log.d(TAG, "Skip updateFallbackActiveDeviceIfNeeded, disable flag is on");

            return;

        }

        if (isWorkProfile(mContext)) {

            Log.d(TAG, "Skip updateFallbackActiveDeviceIfNeeded for work profile.");

            return;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ public class BluetoothEventManagerTest { 


    private void setUpAudioSharing(boolean enableFlag, boolean enableFeature,

            boolean enableProfile, boolean workProfile) {

        mSetFlagsRule.disableFlags(Flags.FLAG_DISABLE_AUDIO_SHARING_AUTO_PICK_FALLBACK_IN_UI);

        if (enableFlag) {

            mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);

        } else {