Snap for 12630846 from 5a06b74ef1 to 25Q1-release

Change-Id: I8e800ed5dd76871a79714be11af493fe59950e98

res/xml/captioning_settings.xml

@@ -22,7 +22,8 @@
 
     <com.android.settingslib.widget.TopIntroPreference
         android:key="captioning_intro"
-        android:title="@string/accessibility_captioning_preference_intro"/>
+        android:title="@string/accessibility_captioning_preference_intro"
+        settings:searchable="false"/>
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="captioning_preview"
@@ -44,7 +45,8 @@
     <Preference
         android:fragment="com.android.settings.accessibility.CaptioningMoreOptionsFragment"
         android:key="captioning_more_options"
-        android:title="@string/captioning_more_options_title" />
+        android:title="@string/captioning_more_options_title"
+        settings:searchable="false" />
 
     <com.android.settings.accessibility.AccessibilityFooterPreference
         android:key="captioning_settings_footer"

res/xml/network_provider_internet.xml

@@ -30,6 +30,7 @@
         settings:allowDividerAbove="true"
         settings:keywords="@string/keywords_internet"
         settings:useAdminDisabledSummary="true"
+        settings:userRestriction="no_config_wifi"
         settings:controller="com.android.settings.network.InternetPreferenceControllerV2" />
 
     <com.android.settingslib.RestrictedPreference

src/com/android/settings/accessibility/CaptioningCustomController.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.accessibility;
 
+import android.annotation.Nullable;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.os.Handler;
@@ -39,6 +40,7 @@ import java.util.List;
 public class CaptioningCustomController extends BasePreferenceController
         implements LifecycleObserver, OnStart, OnStop {
 
+    @Nullable
     private Preference mCustom;
     private final CaptionHelper mCaptionHelper;
     private final ContentResolver mContentResolver;
@@ -50,32 +52,41 @@ public class CaptioningCustomController extends BasePreferenceController
     );
 
     public CaptioningCustomController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
+        this(context, preferenceKey, new CaptionHelper(context),
-        mCaptionHelper = new CaptionHelper(context);
+                new AccessibilitySettingsContentObserver(new Handler(Looper.getMainLooper())));
-        mContentResolver = context.getContentResolver();
-        mSettingsContentObserver = new AccessibilitySettingsContentObserver(
-                new Handler(Looper.getMainLooper()));
-        mSettingsContentObserver.registerKeysToObserverCallback(CAPTIONING_FEATURE_KEYS,
-                key -> refreshShowingCustom());
     }
 
     @VisibleForTesting
-    CaptioningCustomController(Context context, String preferenceKey,
+    CaptioningCustomController(
+            Context context, String preferenceKey, CaptionHelper captionHelper,
             AccessibilitySettingsContentObserver contentObserver) {
-        this(context, preferenceKey);
+        super(context, preferenceKey);
+        mCaptionHelper = new CaptionHelper(context);
+        mContentResolver = context.getContentResolver();
         mSettingsContentObserver = contentObserver;
+        mSettingsContentObserver.registerKeysToObserverCallback(CAPTIONING_FEATURE_KEYS, key -> {
+            if (mCustom != null) {
+                mCustom.setVisible(shouldShowPreference());
+            }
+        });
     }
 
     @Override
     public int getAvailabilityStatus() {
+        if (com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
+            return (shouldShowPreference()) ? AVAILABLE : AVAILABLE_UNSEARCHABLE;
+        } else {
             return AVAILABLE;
         }
+    }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mCustom = screen.findPreference(getPreferenceKey());
-        refreshShowingCustom();
+        if (mCustom != null) {
+            mCustom.setVisible(shouldShowPreference());
+        }
     }
 
     @Override
@@ -88,9 +99,7 @@ public class CaptioningCustomController extends BasePreferenceController
         mSettingsContentObserver.unregister(mContentResolver);
     }
 
-    private void refreshShowingCustom() {
+    private boolean shouldShowPreference() {
-        final boolean isCustomPreset =
+        return mCaptionHelper.getRawUserStyle() == CaptioningManager.CaptionStyle.PRESET_CUSTOM;
-                mCaptionHelper.getRawUserStyle() == CaptioningManager.CaptionStyle.PRESET_CUSTOM;
-        mCustom.setVisible(isCustomPreset);
     }
 }

src/com/android/settings/accessibility/CaptioningWindowColorController.java

@@ -19,10 +19,12 @@ package com.android.settings.accessibility;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
+import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 
 import androidx.preference.PreferenceScreen;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
 import com.android.settings.core.BasePreferenceController;
@@ -34,15 +36,27 @@ public class CaptioningWindowColorController extends BasePreferenceController
     private final CaptionHelper mCaptionHelper;
     private int mCachedNonDefaultOpacity = CaptionStyle.COLOR_UNSPECIFIED;
 
-    public CaptioningWindowColorController(Context context, String preferenceKey) {
+    @VisibleForTesting
+    CaptioningWindowColorController(Context context, String preferenceKey,
+            CaptionHelper captionHelper) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
+        mCaptionHelper = captionHelper;
+    }
+
+    public CaptioningWindowColorController(Context context, String preferenceKey) {
+        this(context, preferenceKey, new CaptionHelper(context));
     }
 
     @Override
     public int getAvailabilityStatus() {
+        if (com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
+            return (mCaptionHelper.getRawUserStyle()
+                    == CaptioningManager.CaptionStyle.PRESET_CUSTOM)
+                    ? AVAILABLE : AVAILABLE_UNSEARCHABLE;
+        } else {
             return AVAILABLE;
         }
+    }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {

src/com/android/settings/accessibility/CaptioningWindowOpacityController.java

@@ -18,9 +18,11 @@ package com.android.settings.accessibility;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.view.accessibility.CaptioningManager;
 
 import androidx.preference.PreferenceScreen;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
 import com.android.settings.core.BasePreferenceController;
@@ -31,15 +33,27 @@ public class CaptioningWindowOpacityController extends BasePreferenceController
 
     private final CaptionHelper mCaptionHelper;
 
-    public CaptioningWindowOpacityController(Context context, String preferenceKey) {
+    @VisibleForTesting
+    CaptioningWindowOpacityController(Context context, String preferenceKey,
+            CaptionHelper captionHelper) {
         super(context, preferenceKey);
-        mCaptionHelper = new CaptionHelper(context);
+        mCaptionHelper = captionHelper;
+    }
+
+    public CaptioningWindowOpacityController(Context context, String preferenceKey) {
+        this(context, preferenceKey, new CaptionHelper(context));
     }
 
     @Override
     public int getAvailabilityStatus() {
+        if (com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) {
+            return (mCaptionHelper.getRawUserStyle()
+                    == CaptioningManager.CaptionStyle.PRESET_CUSTOM)
+                    ? AVAILABLE : AVAILABLE_UNSEARCHABLE;
+        } else {
             return AVAILABLE;
         }
+    }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {

src/com/android/settings/accounts/AccountTypePreferenceLoader.java

@@ -20,6 +20,7 @@ package com.android.settings.accounts;
 import android.accounts.Account;
 import android.accounts.AuthenticatorDescription;
 import android.content.ClipData;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -242,13 +243,19 @@ public class AccountTypePreferenceLoader {
     }
 
     /**
-     * Determines if the supplied Intent is safe. A safe intent is one that is
+     * Determines if the supplied Intent is safe. A safe intent is one that
-     * will launch a exported=true activity or owned by the same uid as the
+     * will launch an exported=true activity or owned by the same uid as the
      * authenticator supplying the intent.
      */
-    private boolean isSafeIntent(PackageManager pm, Intent intent, String acccountType) {
+    @VisibleForTesting
+    boolean isSafeIntent(PackageManager pm, Intent intent, String accountType) {
+        if (TextUtils.equals(intent.getScheme(), ContentResolver.SCHEME_CONTENT)) {
+            Log.e(TAG, "Intent with a content scheme is unsafe.");
+            return false;
+        }
+
         AuthenticatorDescription authDesc =
-            mAuthenticatorHelper.getAccountTypeDescription(acccountType);
+                mAuthenticatorHelper.getAccountTypeDescription(accountType);
         ResolveInfo resolveInfo = pm.resolveActivityAsUser(intent, 0, mUserHandle.getIdentifier());
         if (resolveInfo == null) {
             return false;

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

@@ -77,7 +77,7 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater
             // It would show in Available Devices group if the audio sharing flag is disabled or
             // the device is not in the audio sharing session.
             if (cachedDevice.isConnectedLeAudioDevice()) {
-                if (BluetoothUtils.isAudioSharingEnabled()
+                if (BluetoothUtils.isAudioSharingUIAvailable(mContext)
                         && BluetoothUtils.hasConnectedBroadcastSource(
                         cachedDevice, mLocalBtManager)) {
                     Log.d(

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

@@ -228,10 +228,7 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere
             final BluetoothDevice device = cachedDevice.getDevice();
             if (device != null
                     && mSelectedList.contains(device)) {
-                if (!BluetoothUtils.isAudioSharingEnabled()) {
+                if (BluetoothUtils.isAudioSharingUIAvailable(getContext())) {
-                    finish();
-                    return;
-                }
                     if (bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT
                             && state == BluetoothAdapter.STATE_CONNECTED
                             && device.equals(mJustBonded)
@@ -242,6 +239,9 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere
                         mHandler.removeMessages(AUTO_DISMISS_MESSAGE_ID);
                         finishFragmentWithResultForAudioSharing(device);
                     }
+                } else {
+                    finish();
+                }
             } else {
                 onDeviceDeleted(cachedDevice);
             }
@@ -309,7 +309,7 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere
 
     @VisibleForTesting
     boolean shouldTriggerAudioSharingShareThenPairFlow() {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return false;
+        if (BluetoothUtils.isAudioSharingUIAvailable(getContext())) {
             Activity activity = getActivity();
             Intent intent = activity == null ? null : activity.getIntent();
             Bundle args =
@@ -319,6 +319,8 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere
             return args != null
                     && args.getBoolean(EXTRA_PAIR_AND_JOIN_SHARING, false);
         }
+        return false;
+    }
 
     private void addOnMetadataChangedListener(@Nullable BluetoothDevice device) {
         var unused = ThreadUtils.postOnBackgroundThread(() -> {

src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java

@@ -179,7 +179,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
         super(context, KEY);
         mBtManager = Utils.getLocalBtManager(mContext);
         mExecutor = Executors.newSingleThreadExecutor();
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
             mBroadcast =
                     mBtManager == null
                             ? null
@@ -200,7 +200,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
             Log.d(TAG, "onStart() Bluetooth is not supported on this device");
             return;
         }
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
             registerAudioSharingCallbacks();
         }
         mBtManager.getEventManager().registerCallback(this);
@@ -216,7 +216,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
             Log.d(TAG, "onStop() Bluetooth is not supported on this device");
             return;
         }
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
             unregisterAudioSharingCallbacks();
         }
         if (mBluetoothDeviceUpdater != null) {
@@ -278,7 +278,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
     public void onDeviceClick(Preference preference) {
         final CachedBluetoothDevice cachedDevice =
                 ((BluetoothDevicePreference) preference).getBluetoothDevice();
-        if (BluetoothUtils.isAudioSharingEnabled() && mDialogHandler != null) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext) && mDialogHandler != null) {
             mDialogHandler.handleDeviceConnected(cachedDevice, /* userTriggered= */ true);
             FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
                     .action(mContext, SettingsEnums.ACTION_MEDIA_DEVICE_CLICK);
@@ -294,7 +294,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
                         fragment.getContext(),
                         AvailableMediaDeviceGroupController.this,
                         fragment.getMetricsCategory());
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
             mDialogHandler = new AudioSharingDialogHandler(mContext, fragment);
         }
     }
@@ -341,7 +341,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
                             if (isAudioModeOngoingCall(mContext)) {
                                 // in phone call
                                 titleResId = R.string.connected_device_call_device_title;
-                            } else if (BluetoothUtils.isAudioSharingEnabled()
+                            } else if (BluetoothUtils.isAudioSharingUIAvailable(mContext)
                                     && BluetoothUtils.isBroadcasting(mBtManager)) {
                                 // without phone call, in audio sharing
                                 titleResId = R.string.audio_sharing_media_device_group_title;

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

@@ -80,7 +80,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
                             + ", action : "
                             + action);
         }
-        if (BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(context)) {
             use(AudioSharingDevicePreferenceController.class).init(this);
         }
         use(AvailableMediaDeviceGroupController.class).init(this);

src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java

@@ -54,10 +54,8 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     private static final int MAX_DEVICE_NUM = 3;
-    private static final int DOCK_DEVICE_INDEX = 9;
     private static final String KEY_SEE_ALL = "previously_connected_devices_see_all";
 
-    private final List<Preference> mDevicesList = new ArrayList<>();
     private final List<Preference> mDockDevicesList = new ArrayList<>();
     private final Map<BluetoothDevice, Preference> mDevicePreferenceMap = new HashMap<>();
     private final BluetoothAdapter mBluetoothAdapter;
@@ -118,6 +116,8 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
         mContext.registerReceiver(mReceiver, mIntentFilter,
                 Context.RECEIVER_EXPORTED_UNAUDITED);
         mBluetoothDeviceUpdater.refreshPreference();
+        Log.d(TAG, "Updating preference group by onStart on thread "
+                + Thread.currentThread().getName());
         updatePreferenceGroup();
     }
 
@@ -146,55 +146,11 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
         if (DEBUG) {
             Log.d(TAG, "onDeviceAdded() " + preference.getTitle());
         }
+        Log.d(TAG, "Updating preference group by onDeviceAdded on thread "
+                + Thread.currentThread().getName());
         updatePreferenceGroup();
     }
 
-    private void addPreference(int index, Preference preference) {
-        if (preference instanceof BluetoothDevicePreference) {
-            if (index >= 0 && mDevicesList.size() >= index) {
-                mDevicesList.add(index, preference);
-            } else {
-                mDevicesList.add(preference);
-            }
-        } else {
-            mDockDevicesList.add(preference);
-        }
-        addPreference();
-    }
-
-    private void addPreference() {
-        mPreferenceGroup.removeAll();
-        mPreferenceGroup.addPreference(mSeeAllPreference);
-        final int size = getDeviceListSize();
-        for (int i = 0; i < size; i++) {
-            if (DEBUG) {
-                Log.d(TAG, "addPreference() add device : " + mDevicesList.get(i).getTitle());
-            }
-            mDevicesList.get(i).setOrder(i);
-            mPreferenceGroup.addPreference(mDevicesList.get(i));
-        }
-        if (mDockDevicesList.size() > 0) {
-            for (int i = 0; i < getDockDeviceListSize(MAX_DEVICE_NUM - size); i++) {
-                if (DEBUG) {
-                    Log.d(TAG, "addPreference() add dock device : "
-                            + mDockDevicesList.get(i).getTitle());
-                }
-                mDockDevicesList.get(i).setOrder(DOCK_DEVICE_INDEX);
-                mPreferenceGroup.addPreference(mDockDevicesList.get(i));
-            }
-        }
-    }
-
-    private int getDeviceListSize() {
-        return mDevicesList.size() >= MAX_DEVICE_NUM
-                ? MAX_DEVICE_NUM : mDevicesList.size();
-    }
-
-    private int getDockDeviceListSize(int availableSize) {
-        return mDockDevicesList.size() >= availableSize
-                ? availableSize : mDockDevicesList.size();
-    }
-
     @Override
     public void onDeviceRemoved(Preference preference) {
         if (preference instanceof BluetoothDevicePreference) {
@@ -207,19 +163,22 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
         if (DEBUG) {
             Log.d(TAG, "onDeviceRemoved() " + preference.getTitle());
         }
+        Log.d(TAG, "Updating preference group by onDeviceRemoved on thread "
+                + Thread.currentThread().getName());
         updatePreferenceGroup();
     }
 
     /** Sort the preferenceGroup by most recently used. */
     public void updatePreferenceGroup() {
         mPreferenceGroup.removeAll();
-        mPreferenceGroup.addPreference(mSeeAllPreference);
         if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()) {
             // Bluetooth is supported
             int order = 0;
             for (BluetoothDevice device : mBluetoothAdapter.getMostRecentlyConnectedDevices()) {
                 Preference preference = mDevicePreferenceMap.getOrDefault(device, null);
                 if (preference != null) {
+                    Log.d(TAG, "Adding preference with order " + order + " when there are "
+                            + mPreferenceGroup.getPreferenceCount());
                     preference.setOrder(order);
                     mPreferenceGroup.addPreference(preference);
                     order += 1;
@@ -237,6 +196,7 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
                 order += 1;
             }
         }
+        mPreferenceGroup.addPreference(mSeeAllPreference);
         updatePreferenceVisibility();
     }
 

src/com/android/settings/connecteddevice/audiosharing/AudioSharingActivity.java

@@ -25,7 +25,7 @@ public class AudioSharingActivity extends SettingsActivity {
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
-        if (!BluetoothUtils.isAudioSharingEnabled()) {
+        if (!BluetoothUtils.isAudioSharingUIAvailable(this)) {
             finish();
         }
     }

src/com/android/settings/connecteddevice/audiosharing/AudioSharingBasePreferenceController.java

@@ -55,7 +55,8 @@ public abstract class AudioSharingBasePreferenceController extends BasePreferenc
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return (BluetoothUtils.isAudioSharingUIAvailable(mContext))
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java

@@ -55,7 +55,7 @@ public class AudioSharingBluetoothDeviceUpdater extends BluetoothDeviceUpdater
         if (isDeviceConnected(cachedDevice) && isDeviceInCachedDevicesList(cachedDevice)) {
             // If device is LE audio device and has a broadcast source,
             // it would show in audio sharing devices group.
-            if (BluetoothUtils.isAudioSharingEnabled()
+            if (BluetoothUtils.isAudioSharingUIAvailable(mContext)
                     && cachedDevice.isConnectedLeAudioDevice()
                     && BluetoothUtils.hasConnectedBroadcastSource(cachedDevice, mLocalBtManager)) {
                 isFilterMatched = true;

src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java

@@ -65,11 +65,15 @@ public class AudioSharingCallAudioDialogFragment extends InstrumentedDialogFragm
      * @param listener The callback to handle the user action on this dialog.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             int checkedItemIndex,
             @NonNull DialogEventListener listener) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -88,6 +92,7 @@ public class AudioSharingCallAudioDialogFragment extends InstrumentedDialogFragm
                 dialog.show(manager, TAG);
             }
         }
+    }
 
     @Override
     @NonNull

src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java

@@ -155,7 +155,8 @@ public class AudioSharingCompatibilityPreferenceController extends TogglePrefere
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java

@@ -44,8 +44,12 @@ public class AudioSharingConfirmDialogFragment extends InstrumentedDialogFragmen
      *
      * @param host The Fragment this dialog will be hosted.
      */
-    public static void show(Fragment host) {
+    public static void show(@Nullable Fragment host) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -62,6 +66,7 @@ public class AudioSharingConfirmDialogFragment extends InstrumentedDialogFragmen
             AudioSharingConfirmDialogFragment dialogFrag = new AudioSharingConfirmDialogFragment();
             dialogFrag.show(manager, TAG);
         }
+    }
 
     @Override
     @NonNull

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDashboardFragment.java

@@ -45,6 +45,7 @@ public class AudioSharingDashboardFragment extends DashboardFragment
     public static final int SHARE_THEN_PAIR_REQUEST_CODE = 1002;
 
     SettingsMainSwitchBar mMainSwitchBar;
+    private Context mContext;
     private AudioSharingDeviceVolumeGroupController mAudioSharingDeviceVolumeGroupController;
     private AudioSharingCallAudioPreferenceController mAudioSharingCallAudioPreferenceController;
     private AudioSharingPlaySoundPreferenceController mAudioSharingPlaySoundPreferenceController;
@@ -78,6 +79,7 @@ public class AudioSharingDashboardFragment extends DashboardFragment
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
+        mContext = context;
         mAudioSharingDeviceVolumeGroupController =
                 use(AudioSharingDeviceVolumeGroupController.class);
         mAudioSharingDeviceVolumeGroupController.init(this);
@@ -107,11 +109,12 @@ public class AudioSharingDashboardFragment extends DashboardFragment
     @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
-        // In share then pair flow, after users be routed to pair new device page and successfully
+            // In share then pair flow, after users be routed to pair new device page and
-        // pair and connect an LEA headset, the pair fragment will be finished with RESULT_OK
+            // successfully pair and connect an LEA headset, the pair fragment will be finished with
-        // and EXTRA_BT_DEVICE_TO_AUTO_ADD_SOURCE, pass the BT device to switch bar controller,
+            // RESULT_OK and EXTRA_BT_DEVICE_TO_AUTO_ADD_SOURCE, pass the BT device to switch bar
-        // which is responsible for adding source to the device with loading indicator.
+            // controller, which is responsible for adding source to the device with loading
+            // indicator.
             if (requestCode == SHARE_THEN_PAIR_REQUEST_CODE) {
                 if (resultCode == Activity.RESULT_OK) {
                     BluetoothDevice btDevice =
@@ -128,6 +131,7 @@ public class AudioSharingDashboardFragment extends DashboardFragment
                 }
             }
         }
+    }
 
     @Override
     public void onAudioSharingStateChanged() {

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java

@@ -308,7 +308,8 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() && mBluetoothDeviceUpdater != null
+        return (BluetoothUtils.isAudioSharingUIAvailable(mContext)
+                && mBluetoothDeviceUpdater != null)
                 ? AVAILABLE_UNSEARCHABLE
                 : UNSUPPORTED_ON_DEVICE;
     }

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java

@@ -84,11 +84,15 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment {
      * @param eventData   The eventData to log with for dialog onClick events.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             @NonNull DialogEventListener listener,
             @NonNull Pair<Integer, Object>[] eventData) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -116,6 +120,7 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment {
             dialogFrag.setArguments(bundle);
             dialogFrag.show(manager, TAG);
         }
+    }
 
     /** Return the tag of {@link AudioSharingDialogFragment} dialog. */
     public static @NonNull String tag() {

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java

@@ -80,12 +80,16 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag
      * @param eventData The eventData to log with for dialog onClick events.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             @NonNull CachedBluetoothDevice newDevice,
             @NonNull DialogEventListener listener,
             @NonNull Pair<Integer, Object>[] eventData) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -122,17 +126,7 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag
                                             + "dismiss current dialog.",
                                     newGroupId));
                     dialog.dismiss();
-                var unused =
+                    logDialogAutoDismiss(dialog);
-                        ThreadUtils.postOnBackgroundThread(
-                                () ->
-                                        FeatureFactory.getFeatureFactory()
-                                                .getMetricsFeatureProvider()
-                                                .action(
-                                                        dialog.getContext(),
-                                                        SettingsEnums
-                                                        .ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS,
-                                                        SettingsEnums
-                                                        .DIALOG_AUDIO_SHARING_SWITCH_DEVICE));
                 }
             }
             sListener = listener;
@@ -147,6 +141,7 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag
             dialogFrag.setArguments(bundle);
             dialogFrag.show(manager, TAG);
         }
+    }
 
     /** Return the tag of {@link AudioSharingDisconnectDialogFragment} dialog. */
     public static @NonNull String tag() {
@@ -216,4 +211,17 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag
                         AudioSharingDeviceAdapter.ActionType.REMOVE));
         return builder.build();
     }
+
+    private static void logDialogAutoDismiss(AlertDialog dialog) {
+        var unused =
+                ThreadUtils.postOnBackgroundThread(
+                        () -> FeatureFactory.getFeatureFactory()
+                                .getMetricsFeatureProvider()
+                                .action(
+                                        dialog.getContext(),
+                                        SettingsEnums
+                                                .ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS,
+                                        SettingsEnums
+                                                .DIALOG_AUDIO_SHARING_SWITCH_DEVICE));
+    }
 }

src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragment.java

@@ -46,7 +46,11 @@ public class AudioSharingErrorDialogFragment extends InstrumentedDialogFragment
      * @param host The Fragment this dialog will be hosted.
      */
     public static void show(@Nullable Fragment host) {
-        if (host == null || !BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -68,6 +72,7 @@ public class AudioSharingErrorDialogFragment extends InstrumentedDialogFragment
             AudioSharingErrorDialogFragment dialogFrag = new AudioSharingErrorDialogFragment();
             dialogFrag.show(manager, TAG);
         }
+    }
 
     @Override
     @NonNull

src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragment.java

@@ -62,7 +62,11 @@ public class AudioSharingIncompatibleDialogFragment extends InstrumentedDialogFr
      */
     public static void show(@Nullable Fragment host, @NonNull String deviceName,
             @NonNull DialogEventListener listener) {
-        if (host == null || !BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -89,6 +93,7 @@ public class AudioSharingIncompatibleDialogFragment extends InstrumentedDialogFr
             dialogFrag.setArguments(bundle);
             dialogFrag.show(manager, TAG);
         }
+    }
 
     @Override
     @NonNull

src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java

@@ -77,12 +77,16 @@ public class AudioSharingJoinDialogFragment extends InstrumentedDialogFragment {
      * @param eventData The eventData to log with for dialog onClick events.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             @NonNull CachedBluetoothDevice newDevice,
             @NonNull DialogEventListener listener,
             @NonNull Pair<Integer, Object>[] eventData) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -107,11 +111,13 @@ public class AudioSharingJoinDialogFragment extends InstrumentedDialogFragment {
                 final Bundle bundle = new Bundle();
                 bundle.putParcelableList(BUNDLE_KEY_DEVICE_ITEMS, deviceItems);
                 bundle.putString(BUNDLE_KEY_NEW_DEVICE_NAME, newDevice.getName());
-            final AudioSharingJoinDialogFragment dialogFrag = new AudioSharingJoinDialogFragment();
+                final AudioSharingJoinDialogFragment dialogFrag =
+                        new AudioSharingJoinDialogFragment();
                 dialogFrag.setArguments(bundle);
                 dialogFrag.show(manager, TAG);
             }
         }
+    }
 
     /** Return the tag of {@link AudioSharingJoinDialogFragment} dialog. */
     public static @NonNull String tag() {

src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceController.java

@@ -174,7 +174,8 @@ public class AudioSharingNamePreferenceController extends BasePreferenceControll
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceController.java

@@ -113,7 +113,8 @@ public class AudioSharingPasswordPreferenceController extends BasePreferenceCont
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/audiosharing/AudioSharingPlaySoundPreferenceController.java

@@ -57,7 +57,7 @@ public class AudioSharingPlaySoundPreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return (mRingtone != null && BluetoothUtils.isAudioSharingEnabled())
+        return (mRingtone != null && BluetoothUtils.isAudioSharingUIAvailable(mContext))
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }

src/com/android/settings/connecteddevice/audiosharing/AudioSharingPreferenceController.java

@@ -135,7 +135,8 @@ public class AudioSharingPreferenceController extends BasePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/audiosharing/AudioSharingProgressDialogFragment.java

@@ -65,7 +65,11 @@ public class AudioSharingProgressDialogFragment extends InstrumentedDialogFragme
      * @param message The content to be shown on the dialog.
      */
     public static void show(@Nullable Fragment host, @NonNull String message) {
-        if (host == null || !BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -95,14 +99,20 @@ public class AudioSharingProgressDialogFragment extends InstrumentedDialogFragme
             Log.d(TAG, "Show up the progress dialog.");
             Bundle args = new Bundle();
             args.putString(BUNDLE_KEY_MESSAGE, message);
-        AudioSharingProgressDialogFragment dialogFrag = new AudioSharingProgressDialogFragment();
+            AudioSharingProgressDialogFragment dialogFrag =
+                    new AudioSharingProgressDialogFragment();
             dialogFrag.setArguments(args);
             dialogFrag.show(manager, TAG);
         }
+    }
 
     /** Dismiss the {@link AudioSharingProgressDialogFragment} dialog. */
     public static void dismiss(@Nullable Fragment host) {
-        if (host == null || !BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to dismiss dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -116,6 +126,7 @@ public class AudioSharingProgressDialogFragment extends InstrumentedDialogFragme
                 dialog.dismiss();
             }
         }
+    }
 
     @Override
     @NonNull

src/com/android/settings/connecteddevice/audiosharing/AudioSharingReceiver.java

@@ -62,7 +62,7 @@ public class AudioSharingReceiver extends BroadcastReceiver {
                         intent.getIntExtra(
                                 LocalBluetoothLeBroadcast.EXTRA_LE_AUDIO_SHARING_STATE, -1);
                 if (state == LocalBluetoothLeBroadcast.BROADCAST_STATE_ON) {
-                    if (!BluetoothUtils.isAudioSharingEnabled()) {
+                    if (!BluetoothUtils.isAudioSharingUIAvailable(context)) {
                         Log.w(TAG, "Skip showSharingNotification, feature disabled.");
                         return;
                     }
@@ -85,7 +85,7 @@ public class AudioSharingReceiver extends BroadcastReceiver {
                 }
                 break;
             case ACTION_LE_AUDIO_SHARING_STOP:
-                if (BluetoothUtils.isAudioSharingEnabled()) {
+                if (BluetoothUtils.isAudioSharingUIAvailable(context)) {
                     LocalBluetoothManager manager = Utils.getLocalBtManager(context);
                     if (BluetoothUtils.isBroadcasting(manager)) {
                         AudioSharingUtils.stopBroadcasting(manager);

src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java

@@ -77,12 +77,16 @@ public class AudioSharingStopDialogFragment extends InstrumentedDialogFragment {
      * @param eventData The eventData to log with for dialog onClick events.
      */
     public static void show(
-            @NonNull Fragment host,
+            @Nullable Fragment host,
             @NonNull List<AudioSharingDeviceItem> deviceItems,
             @NonNull CachedBluetoothDevice newDevice,
             @NonNull DialogEventListener listener,
             @NonNull Pair<Integer, Object>[] eventData) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) return;
+        if (host == null) {
+            Log.d(TAG, "Fail to show dialog, host is null");
+            return;
+        }
+        if (BluetoothUtils.isAudioSharingUIAvailable(host.getContext())) {
             final FragmentManager manager;
             try {
                 manager = host.getChildFragmentManager();
@@ -119,16 +123,7 @@ public class AudioSharingStopDialogFragment extends InstrumentedDialogFragment {
                                             + "dismiss current dialog.",
                                     newGroupId));
                     dialog.dismiss();
-                var unused =
+                    logDialogAutoDismiss(dialog);
-                        ThreadUtils.postOnBackgroundThread(
-                                () ->
-                                        FeatureFactory.getFeatureFactory()
-                                                .getMetricsFeatureProvider()
-                                                .action(
-                                                        dialog.getContext(),
-                                                        SettingsEnums
-                                                        .ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS,
-                                                        SettingsEnums.DIALOG_STOP_AUDIO_SHARING));
                 }
             }
             sListener = listener;
@@ -142,6 +137,7 @@ public class AudioSharingStopDialogFragment extends InstrumentedDialogFragment {
             dialogFrag.setArguments(bundle);
             dialogFrag.show(manager, TAG);
         }
+    }
 
     /** Return the tag of {@link AudioSharingStopDialogFragment} dialog. */
     public static @NonNull String tag() {
@@ -221,4 +217,16 @@ public class AudioSharingStopDialogFragment extends InstrumentedDialogFragment {
         AudioSharingDialogHelper.updateMessageStyle(dialog);
         return dialog;
     }
+
+    private static void logDialogAutoDismiss(AlertDialog dialog) {
+        var unused =
+                ThreadUtils.postOnBackgroundThread(
+                        () -> FeatureFactory.getFeatureFactory()
+                                .getMetricsFeatureProvider()
+                                .action(
+                                        dialog.getContext(),
+                                        SettingsEnums
+                                                .ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS,
+                                        SettingsEnums.DIALOG_STOP_AUDIO_SHARING));
+    }
 }

src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java

@@ -426,9 +426,7 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
                         () -> {
                             mSwitchBar.setEnabled(true);
                             mSwitchBar.setChecked(false);
-                            if (mFragment != null) {
                             AudioSharingConfirmDialogFragment.show(mFragment);
-                            }
                         });
                 return;
             }
@@ -447,7 +445,8 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -733,13 +732,8 @@ public class AudioSharingSwitchBarController extends BasePreferenceController
                 };
         AudioSharingUtils.postOnMainThread(
                 mContext,
-                () -> {
+                () -> AudioSharingDialogFragment.show(
-                    // Check nullability to pass NullAway check
+                        mFragment, mDeviceItemsForSharing, listener, eventData));
-                    if (mFragment != null) {
-                        AudioSharingDialogFragment.show(
-                                mFragment, mDeviceItemsForSharing, listener, eventData);
-                    }
-                });
     }
 
     private void showErrorDialog() {

src/com/android/settings/connecteddevice/audiosharing/StreamSettingsCategoryController.java

@@ -91,7 +91,8 @@ public class StreamSettingsCategoryController extends BasePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return BluetoothUtils.isAudioSharingEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return BluetoothUtils.isAudioSharingUIAvailable(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override

src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java

@@ -214,15 +214,16 @@ public class AudioStreamConfirmDialog extends InstrumentedDialogFragment {
     }
 
     private int getDialogId(boolean hasMetadata, boolean hasConnectedDevice) {
-        if (!BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(mContext)) {
-            return SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_FEATURE_UNSUPPORTED;
-        }
             if (!hasConnectedDevice) {
                 return SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_NO_LE_DEVICE;
             }
             return hasMetadata
                     ? SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_LISTEN
                     : SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_DATA_ERROR;
+        } else {
+            return SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_FEATURE_UNSUPPORTED;
+        }
     }
 
     @Nullable

src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivity.java

@@ -50,7 +50,7 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
 
     @Override
     protected void createUiFromIntent(@Nullable Bundle savedState, Intent intent) {
-        if (BluetoothUtils.isAudioSharingEnabled()
+        if (BluetoothUtils.isAudioSharingUIAvailable(this)
                 && !AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) {
             Log.d(TAG, "createUiFromIntent() : supported but not ready, skip createUiFromIntent");
             mSavedState = savedState;
@@ -67,7 +67,7 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
 
     @Override
     public void onStart() {
-        if (BluetoothUtils.isAudioSharingEnabled()
+        if (BluetoothUtils.isAudioSharingUIAvailable(this)
                 && !AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) {
             Log.d(TAG, "onStart() : supported but not ready, listen to service ready");
             if (mProfileManager != null) {
@@ -87,7 +87,7 @@ public class AudioStreamConfirmDialogActivity extends SettingsActivity
 
     @Override
     public void onServiceConnected() {
-        if (BluetoothUtils.isAudioSharingEnabled()
+        if (BluetoothUtils.isAudioSharingUIAvailable(this)
                 && AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)) {
             if (mProfileManager != null) {
                 mProfileManager.removeServiceListener(this);

src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java

@@ -122,7 +122,7 @@ public class AudioStreamMediaService extends Service {
 
     @Override
     public void onCreate() {
-        if (!BluetoothUtils.isAudioSharingEnabled()) {
+        if (!BluetoothUtils.isAudioSharingUIAvailable(this)) {
             return;
         }
         Log.d(TAG, "onCreate()");
@@ -181,9 +181,7 @@ public class AudioStreamMediaService extends Service {
     public void onDestroy() {
         Log.d(TAG, "onDestroy()");
         super.onDestroy();
-        if (!BluetoothUtils.isAudioSharingEnabled()) {
+        if (BluetoothUtils.isAudioSharingUIAvailable(this)) {
-            return;
-        }
             if (mDevices != null) {
                 mDevices.clear();
                 mDevices = null;
@@ -197,7 +195,8 @@ public class AudioStreamMediaService extends Service {
             mExecutor.execute(
                     () -> {
                         if (mLocalBtManager != null) {
-                        mLocalBtManager.getEventManager().unregisterCallback(mBluetoothCallback);
+                            mLocalBtManager.getEventManager().unregisterCallback(
+                                    mBluetoothCallback);
                         }
                         if (mLeBroadcastAssistant != null && mBroadcastAssistantCallback != null) {
                             mLeBroadcastAssistant.unregisterServiceCallBack(
@@ -208,6 +207,7 @@ public class AudioStreamMediaService extends Service {
                         }
                     });
         }
+    }
 
     @Override
     public int onStartCommand(@Nullable Intent intent, int flags, int startId) {

src/com/android/settings/network/MobileNetworkListScreen.kt

@@ -16,6 +16,8 @@
 package com.android.settings.network
 
 import android.content.Context
+import android.os.UserManager
+import com.android.settings.PreferenceRestrictionMixin
 import com.android.settings.R
 import com.android.settings.flags.Flags
 import com.android.settingslib.metadata.ProvidePreferenceScreen
@@ -23,7 +25,7 @@ import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
 @ProvidePreferenceScreen
-class MobileNetworkListScreen : PreferenceScreenCreator {
+class MobileNetworkListScreen : PreferenceScreenCreator, PreferenceRestrictionMixin {
     override val key: String
         get() = KEY
 
@@ -36,6 +38,11 @@ class MobileNetworkListScreen : PreferenceScreenCreator {
     override val keywords: Int
         get() = R.string.keywords_more_mobile_networks
 
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKey: String
+        get() = UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS
+
     override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList()
 
     override fun hasCompleteHierarchy() = false

src/com/android/settings/network/NetworkProviderScreen.kt

@@ -16,6 +16,8 @@
 package com.android.settings.network
 
 import android.content.Context
+import android.os.UserManager
+import com.android.settings.PreferenceRestrictionMixin
 import com.android.settings.R
 import com.android.settings.flags.Flags
 import com.android.settingslib.metadata.PreferenceAvailabilityProvider
@@ -24,7 +26,8 @@ import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
 @ProvidePreferenceScreen
-class NetworkProviderScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
+class NetworkProviderScreen :
+    PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceRestrictionMixin {
     override val key: String
         get() = KEY
 
@@ -40,6 +43,11 @@ class NetworkProviderScreen : PreferenceScreenCreator, PreferenceAvailabilityPro
     override fun isAvailable(context: Context) =
         context.resources.getBoolean(R.bool.config_show_internet_settings)
 
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKey: String
+        get() = UserManager.DISALLOW_CONFIG_WIFI
+
     override fun isFlagEnabled(context: Context) = Flags.catalystInternetSettings()
 
     override fun hasCompleteHierarchy() = false

src/com/android/settings/network/tether/TetherScreen.kt

@@ -17,6 +17,8 @@ package com.android.settings.network.tether
 
 import android.content.Context
 import android.net.TetheringManager
+import android.os.UserManager
+import com.android.settings.PreferenceRestrictionMixin
 import com.android.settings.R
 import com.android.settings.flags.Flags
 import com.android.settings.network.TetherPreferenceController
@@ -28,7 +30,8 @@ import com.android.settingslib.metadata.preferenceHierarchy
 import com.android.settingslib.preference.PreferenceScreenCreator
 
 @ProvidePreferenceScreen
-class TetherScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
+class TetherScreen :
+    PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceRestrictionMixin {
 
     override val key: String
         get() = KEY
@@ -49,6 +52,11 @@ class TetherScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
 
     override fun isAvailable(context: Context) = TetherUtil.isTetherAvailable(context)
 
+    override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
+
+    override val restrictionKey: String
+        get() = UserManager.DISALLOW_CONFIG_TETHERING
+
     override fun isFlagEnabled(context: Context) = Flags.catalystTetherSettings()
 
     override fun hasCompleteHierarchy() = false

tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java

@@ -23,6 +23,9 @@ import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
 import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 
@@ -49,6 +52,8 @@ public class CaptioningCustomControllerTest {
 
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     @Mock
     private PreferenceScreen mScreen;
     @Mock
@@ -57,22 +62,43 @@ public class CaptioningCustomControllerTest {
     private ContentResolver mContentResolver;
     private CaptioningCustomController mController;
     private Preference mPreference;
+    private CaptionHelper mCaptionHelper;
 
     @Before
     public void setUp() {
         mContentResolver = mContext.getContentResolver();
-        mController = new CaptioningCustomController(mContext, PREF_KEY,
+        mCaptionHelper = new CaptionHelper(mContext);
+        mController = new CaptioningCustomController(mContext, PREF_KEY, mCaptionHelper,
                 mAccessibilitySettingsContentObserver);
         mPreference = new Preference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
     public void getAvailabilityStatus_shouldReturnAvailable() {
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.AVAILABLE);
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_customCaption_shouldReturnAvailable() {
+        mCaptionHelper.setRawUserStyle(CaptionStyle.PRESET_CUSTOM);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_notCustom_shouldReturnUnsearchable() {
+        mCaptionHelper.setRawUserStyle(0);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+    }
+
 
     @Test
     public void displayPreference_byDefault_shouldIsInvisible() {

tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java

@@ -24,6 +24,9 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.accessibility.CaptioningManager;
@@ -53,16 +56,21 @@ public class CaptioningWindowColorControllerTest {
 
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     @Mock
     private PreferenceScreen mScreen;
     private final Context mContext = ApplicationProvider.getApplicationContext();
     private CaptioningWindowColorController mController;
     private ColorPreference mPreference;
     private ShadowCaptioningManager mShadowCaptioningManager;
+    private CaptionHelper mCaptionHelper;
 
     @Before
     public void setUp() {
-        mController = new CaptioningWindowColorController(mContext, "captioning_window_color");
+        mCaptionHelper = new CaptionHelper(mContext);
+        mController = new CaptioningWindowColorController(
+                mContext, "captioning_window_color", mCaptionHelper);
         final AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
         mPreference = new ColorPreference(mContext, attributeSet);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -71,11 +79,30 @@ public class CaptioningWindowColorControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
     public void getAvailabilityStatus_shouldReturnAvailable() {
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.AVAILABLE);
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_customCaption_shouldReturnAvailable() {
+        mCaptionHelper.setRawUserStyle(CaptionStyle.PRESET_CUSTOM);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_noCustom_shouldReturnUnsearchable() {
+        mCaptionHelper.setRawUserStyle(0);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+    }
+
     @Test
     public void getSummary_defaultValue_shouldReturnNone() {
         mController.displayPreference(mScreen);

tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java

@@ -24,6 +24,9 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.accessibility.CaptioningManager;
@@ -48,19 +51,24 @@ import org.robolectric.shadows.ShadowCaptioningManager;
 /** Tests for {@link CaptioningWindowOpacityController}. */
 @RunWith(RobolectricTestRunner.class)
 public class CaptioningWindowOpacityControllerTest {
-
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
     @Mock
     private PreferenceScreen mScreen;
     private final Context mContext = ApplicationProvider.getApplicationContext();
     private CaptioningWindowOpacityController mController;
     private ColorPreference mPreference;
     private ShadowCaptioningManager mShadowCaptioningManager;
+    private CaptionHelper mCaptionHelper;
 
     @Before
     public void setUp() {
-        mController = new CaptioningWindowOpacityController(mContext, "captioning_window_opacity");
+        mCaptionHelper = new CaptionHelper(mContext);
+        mController = new CaptioningWindowOpacityController(
+                mContext, "captioning_window_opacity", mCaptionHelper);
         final AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
         mPreference = new ColorPreference(mContext, attributeSet);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -69,11 +77,30 @@ public class CaptioningWindowOpacityControllerTest {
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
     public void getAvailabilityStatus_shouldReturnAvailable() {
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.AVAILABLE);
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_customCaption_shouldReturnAvailable() {
+        mCaptionHelper.setRawUserStyle(CaptioningManager.CaptionStyle.PRESET_CUSTOM);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+    public void getAvailabilityStatus_notCustom_shouldReturnUnsearchable() {
+        mCaptionHelper.setRawUserStyle(0);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+    }
+
     @Test
     public void getSummary_defaultValue_shouldReturnNonTransparent() {
         mController.displayPreference(mScreen);

tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java

@@ -30,8 +30,11 @@ import static org.mockito.Mockito.when;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
+import android.content.ClipData;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.UserHandle;
 
 import androidx.collection.ArraySet;
@@ -250,4 +253,13 @@ public class AccountTypePreferenceLoaderTest {
         mPrefLoader.filterBlockedFragments(parent, Set.of("nomatch", "other"));
         verify(pref).setOnPreferenceClickListener(any());
     }
+
+    @Test
+    public void isSafeIntent_hasContextScheme_returnFalse() {
+        Intent intent = new Intent();
+        intent.setClipData(ClipData.newRawUri(null,
+                Uri.parse("content://com.android.settings.files/my_cache/NOTICE.html")));
+
+        assertThat(mPrefLoader.isSafeIntent(mPackageManager, intent, mAccount.type)).isFalse();
+    }
 }