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

Commit 2a466400 authored by Yiyi Shen's avatar Yiyi Shen
Browse files

[Audiosharing] Disable auto pick in ui when developer preview on 

Test: atest
Bug: 383469911
Flag: com.android.settingslib.flags.audio_sharing_developer_option
Change-Id: Id3da26924a18585c9aac9cf77b0310202d6c074e
parent 9deb1ec0

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

+1 −1
Original line number Diff line number Diff line
@@ -1064,7 +1064,7 @@ public class BluetoothUtils { 


    /** Get develop option value for audio sharing preview. */

    @WorkerThread

    private static boolean getAudioSharingPreviewValue(@Nullable ContentResolver contentResolver) {

    public static boolean getAudioSharingPreviewValue(@Nullable ContentResolver contentResolver) {

        if (contentResolver == null) return false;

        return Settings.Global.getInt(

                contentResolver,

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

+9 −13
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
    private ContentResolver mContentResolver;

    private ContentObserver mSettingsObserver;

    // Cached broadcast callbacks being register before service is connected.

    private Map<BluetoothLeBroadcast.Callback, Executor> mCachedBroadcastCallbackExecutorMap =

            new ConcurrentHashMap<>();

    private ConcurrentHashMap<BluetoothLeBroadcast.Callback, Executor>

            mCachedBroadcastCallbackExecutorMap = new ConcurrentHashMap<>();



    private final ServiceListener mServiceListener =

            new ServiceListener() {
@@ -873,7 +873,7 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
            @NonNull @CallbackExecutor Executor executor,

            @NonNull BluetoothLeBroadcast.Callback callback) {

        if (mServiceBroadcast == null) {

            Log.d(TAG, "registerServiceCallBack failed, the BluetoothLeBroadcast is null.");

            Log.d(TAG, "registerServiceCallBack failed, proxy not attached.");

            mCachedBroadcastCallbackExecutorMap.putIfAbsent(callback, executor);

            return;

        }
@@ -895,10 +895,7 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
            @NonNull @CallbackExecutor Executor executor,

            @NonNull BluetoothLeBroadcastAssistant.Callback callback) {

        if (mServiceBroadcastAssistant == null) {

            Log.d(

                    TAG,

                    "registerBroadcastAssistantCallback failed, "

                            + "the BluetoothLeBroadcastAssistant is null.");

            Log.d(TAG, "registerBroadcastAssistantCallback failed, proxy not attached.");

            return;

        }
@@ -913,7 +910,7 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
    public void unregisterServiceCallBack(@NonNull BluetoothLeBroadcast.Callback callback) {

        mCachedBroadcastCallbackExecutorMap.remove(callback);

        if (mServiceBroadcast == null) {

            Log.d(TAG, "unregisterServiceCallBack failed, the BluetoothLeBroadcast is null.");

            Log.d(TAG, "unregisterServiceCallBack failed, proxy not attached.");

            return;

        }
@@ -932,10 +929,7 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 
    private void unregisterBroadcastAssistantCallback(

            @NonNull BluetoothLeBroadcastAssistant.Callback callback) {

        if (mServiceBroadcastAssistant == null) {

            Log.d(

                    TAG,

                    "unregisterBroadcastAssistantCallback, "

                            + "the BluetoothLeBroadcastAssistant is null.");

            Log.d(TAG, "unregisterBroadcastAssistantCallback, proxy not attched.");

            return;

        }
@@ -1128,7 +1122,9 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile { 


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

    public void updateFallbackActiveDeviceIfNeeded() {

        if (Flags.disableAudioSharingAutoPickFallbackInUi()) {

        if (Flags.disableAudioSharingAutoPickFallbackInUi() || (mContext != null

                && Flags.audioSharingDeveloperOption()

                && BluetoothUtils.getAudioSharingPreviewValue(mContext.getContentResolver()))) {

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

            return;

        }