Snap for 10214038 from 1df5ad89ee to udc-release

Change-Id: I04e927215b8147b8cc3b9cea2c07cd21c832369f

AndroidManifest.xml

@@ -3717,7 +3717,7 @@
         <!-- Show channel-level notification settings (channel passed in as extras) -->
         <activity android:name=".notification.app.ChannelPanelActivity"
                   android:label="@string/notification_channel_title"
-                  android:theme="@style/Theme.Panel.Material"
+                  android:theme="@style/Theme.Panel"
                   android:excludeFromRecents="true"
                   android:configChanges="keyboardHidden|screenSize"
                   android:exported="true">

res/drawable/button_border_selected.xml

@@ -15,7 +15,10 @@
   limitations under the License.
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
+    <solid
+        android:color="?androidprv:attr/materialColorSurfaceContainer" />
     <stroke
         android:width="2dp"
         android:color="?android:attr/colorAccent"/>

res/drawable/button_border_unselected.xml

@@ -18,7 +18,7 @@
        android:shape="rectangle">
     <stroke
         android:width="1dp"
-        android:color="?android:attr/colorAccent"/>
+        android:color="@color/notification_importance_button_unselected"/>
 
     <corners android:radius="@dimen/rect_button_radius" />
 </shape>

res/values/strings.xml

@@ -1054,8 +1054,10 @@
     <string name="security_fingerprint_disclaimer_lockscreen_disabled_2">You can still use your fingerprint to authorize purchases and app access.</string>
     <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
     <string name="security_settings_fingerprint_enroll_lift_touch_again">Lift finger, then touch sensor again</string>
+    <!-- Dialog title during fingerprint enrollment to indicate bad sensor calibration. [CHAR LIMIT=100] -->
+    <string name="security_settings_fingerprint_bad_calibration_title">Can\u2019t use fingerprint sensor</string>
     <!-- Text shown during fingerprint enrollment to indicate bad sensor calibration. [CHAR LIMIT=100] -->
-    <string name="security_settings_fingerprint_bad_calibration">Can\u2019t use fingerprint sensor. Visit a repair provider</string>
+    <string name="security_settings_fingerprint_bad_calibration">Visit a repair provider.</string>
     <!-- Title for the section that has additional security settings. [CHAR LIMIT=60] -->
     <string name="security_advanced_settings">More security settings</string>
     <!-- String for the "More security settings" summary when a work profile is on the device. [CHAR_LIMIT=NONE] -->

res/values/themes.xml

@@ -227,9 +227,6 @@
         <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
     </style>
 
-    <style name="Theme.Panel.Material" parent="Theme.Panel" >
-        <item name="android:switchStyle">@style/Switch.SettingsLib</item>
-    </style>
     <!-- Material theme for the pages containing TabLayout and ViewPager -->
     <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
         <item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>

src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java

@@ -163,6 +163,8 @@ public class FingerprintErrorDialog extends InstrumentedDialogFragment {
         switch (errMsgId) {
             case FingerprintManager.FINGERPRINT_ERROR_TIMEOUT:
                 return R.string.security_settings_fingerprint_enroll_error_dialog_title;
+            case FingerprintManager.FINGERPRINT_ERROR_BAD_CALIBRATION:
+                return R.string.security_settings_fingerprint_bad_calibration_title;
             default:
                 return R.string
                         .security_settings_fingerprint_enroll_error_unable_to_process_dialog_title;

src/com/android/settings/network/MobileNetworkRepository.java

@@ -88,7 +88,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
     private List<MobileNetworkInfoEntity> mMobileNetworkInfoEntityList = new ArrayList<>();
     private Context mContext;
     private AirplaneModeObserver mAirplaneModeObserver;
-    private Uri mAirplaneModeSettingUri;
+    private DataRoamingObserver mDataRoamingObserver;
     private MetricsFeatureProvider mMetricsFeatureProvider;
     private Map<Integer, MobileDataContentObserver> mDataContentObserverMap = new HashMap<>();
     private int mPhysicalSlotIndex = SubscriptionManager.INVALID_SIM_SLOT_INDEX;
@@ -127,10 +127,13 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
         mUiccInfoDao = mMobileNetworkDatabase.mUiccInfoDao();
         mMobileNetworkInfoDao = mMobileNetworkDatabase.mMobileNetworkInfoDao();
         mAirplaneModeObserver = new AirplaneModeObserver(new Handler(Looper.getMainLooper()));
-        mAirplaneModeSettingUri = Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);
+        mDataRoamingObserver = new DataRoamingObserver(new Handler(Looper.getMainLooper()));
     }
 
     private class AirplaneModeObserver extends ContentObserver {
+        private Uri mAirplaneModeSettingUri =
+                Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);
+
         AirplaneModeObserver(Handler handler) {
             super(handler);
         }
@@ -155,6 +158,46 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
         }
     }
 
+    private class DataRoamingObserver extends ContentObserver {
+        private int mRegSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        private String mBaseField = Settings.Global.DATA_ROAMING;
+
+        DataRoamingObserver(Handler handler) {
+            super(handler);
+        }
+
+        public void register(Context context, int subId) {
+            mRegSubId = subId;
+            String lastField = mBaseField;
+            createTelephonyManagerBySubId(subId);
+            TelephonyManager tm = mTelephonyManagerMap.get(subId);
+            if (tm.getSimCount() != 1) {
+                lastField += subId;
+            }
+            context.getContentResolver().registerContentObserver(
+                    Settings.Global.getUriFor(lastField), false, this);
+        }
+
+        public void unRegister(Context context) {
+            context.getContentResolver().unregisterContentObserver(this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            TelephonyManager tm = mTelephonyManagerMap.get(mRegSubId);
+            if (tm == null) {
+                return;
+            }
+            sExecutor.execute(() -> {
+                insertMobileNetworkInfo(mContext, mRegSubId, tm);
+            });
+            boolean isDataRoamingEnabled = tm.isDataRoamingEnabled();
+            for (MobileNetworkCallback callback : sCallbacks) {
+                callback.onDataRoamingChanged(mRegSubId, isDataRoamingEnabled);
+            }
+        }
+    }
+
     /**
      * Register all callbacks and listener.
      *
@@ -180,6 +223,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
         if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             addRegisterBySubId(subId);
             createTelephonyManagerBySubId(subId);
+            mDataRoamingObserver.register(mContext, subId);
         }
     }
 
@@ -251,6 +295,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
         if (sCallbacks.isEmpty()) {
             mSubscriptionManager.removeOnSubscriptionsChangedListener(this);
             mAirplaneModeObserver.unRegister(mContext);
+            mDataRoamingObserver.unRegister(mContext);
             mDataContentObserverMap.forEach((id, observer) -> {
                 observer.unRegister(mContext);
             });
@@ -709,6 +754,12 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
         default void onAirplaneModeChanged(boolean enabled) {
         }
 
+        /**
+         * Notify clients data roaming changed of subscription.
+         */
+        default void onDataRoamingChanged(int subId, boolean enabled) {
+        }
+
         default void onCallStateChanged(int state) {
         }
     }

src/com/android/settings/network/telephony/MobileNetworkSettings.java

@@ -52,7 +52,6 @@ import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity;
 import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
-import com.android.settingslib.mobile.dataservice.UiccInfoEntity;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.utils.ThreadUtils;
 
@@ -441,8 +440,10 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
                 /** suppress full page if user is not admin */
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
-                    return SubscriptionUtil.isSimHardwareVisible(context) &&
+                    boolean isAirplaneOff = Settings.Global.getInt(context.getContentResolver(),
-                            context.getSystemService(UserManager.class).isAdminUser();
+                            Settings.Global.AIRPLANE_MODE_ON, 0) == 0;
+                    return isAirplaneOff && SubscriptionUtil.isSimHardwareVisible(context)
+                            && context.getSystemService(UserManager.class).isAdminUser();
                 }
             };
 

src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java

@@ -21,6 +21,7 @@ import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.util.Log;
 
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
@@ -34,6 +35,7 @@ import com.android.settings.network.telephony.TelephonyConstants.TelephonyManage
  */
 public class PreferredNetworkModePreferenceController extends TelephonyBasePreferenceController
         implements ListPreference.OnPreferenceChangeListener {
+    private static final String TAG = "PrefNetworkModeCtrl";
 
     private CarrierConfigCache mCarrierConfigCache;
     private TelephonyManager mTelephonyManager;
@@ -99,6 +101,10 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
     }
 
     private int getPreferredNetworkMode() {
+        if (mTelephonyManager == null) {
+            Log.w(TAG, "TelephonyManager is null");
+            return TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;
+        }
         return MobileNetworkUtils.getNetworkTypeFromRaf(
                 (int) mTelephonyManager.getAllowedNetworkTypesForReason(
                         TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));

src/com/android/settings/network/telephony/RoamingPreferenceController.java

@@ -21,28 +21,23 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 
 import android.content.Context;
 import android.os.PersistableBundle;
-import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.OnLifecycleEvent;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.network.GlobalSettingsChangeListener;
 import com.android.settings.network.MobileNetworkRepository;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity;
-import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
-import com.android.settingslib.mobile.dataservice.UiccInfoEntity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,7 +47,6 @@ import java.util.List;
  */
 public class RoamingPreferenceController extends TelephonyTogglePreferenceController implements
         LifecycleObserver, MobileNetworkRepository.MobileNetworkCallback {
-
     private static final String TAG = "RoamingController";
     private static final String DIALOG_TAG = "MobileDataDialog";
 
@@ -63,15 +57,6 @@ public class RoamingPreferenceController extends TelephonyTogglePreferenceContro
     protected LifecycleOwner mLifecycleOwner;
     private List<MobileNetworkInfoEntity> mMobileNetworkInfoEntityList = new ArrayList<>();
 
-    /**
-     * There're 2 listeners both activated at the same time.
-     * For project that access DATA_ROAMING, only first listener is functional.
-     * For project that access "DATA_ROAMING + subId", first listener will be stopped when receiving
-     * any onChange from second listener.
-     */
-    private GlobalSettingsChangeListener mListener;
-    private GlobalSettingsChangeListener mListenerForSubId;
-
     @VisibleForTesting
     FragmentManager mFragmentManager;
     MobileNetworkInfoEntity mMobileNetworkInfoEntity;
@@ -102,34 +87,11 @@ public class RoamingPreferenceController extends TelephonyTogglePreferenceContro
     public void onStart() {
         mMobileNetworkRepository.addRegister(mLifecycleOwner, this, mSubId);
         mMobileNetworkRepository.updateEntity();
-        if (mListener == null) {
-            mListener = new GlobalSettingsChangeListener(mContext,
-                    Settings.Global.DATA_ROAMING) {
-                public void onChanged(String field) {
-                    updateState(mSwitchPreference);
-                }
-            };
-        }
-        stopMonitorSubIdSpecific();
-
-        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-            return;
-        }
-
-        mListenerForSubId = new GlobalSettingsChangeListener(mContext,
-                Settings.Global.DATA_ROAMING + mSubId) {
-            public void onChanged(String field) {
-                stopMonitor();
-                updateState(mSwitchPreference);
-            }
-        };
     }
 
     @OnLifecycleEvent(ON_STOP)
     public void onStop() {
         mMobileNetworkRepository.removeRegister(this);
-        stopMonitor();
-        stopMonitorSubIdSpecific();
     }
 
     @Override
@@ -219,20 +181,6 @@ public class RoamingPreferenceController extends TelephonyTogglePreferenceContro
         dialogFragment.show(mFragmentManager, DIALOG_TAG);
     }
 
-    private void stopMonitor() {
-        if (mListener != null) {
-            mListener.close();
-            mListener = null;
-        }
-    }
-
-    private void stopMonitorSubIdSpecific() {
-        if (mListenerForSubId != null) {
-            mListenerForSubId.close();
-            mListenerForSubId = null;
-        }
-    }
-
     @VisibleForTesting
     public void setMobileNetworkInfoEntity(MobileNetworkInfoEntity mobileNetworkInfoEntity) {
         mMobileNetworkInfoEntity = mobileNetworkInfoEntity;
@@ -251,4 +199,13 @@ public class RoamingPreferenceController extends TelephonyTogglePreferenceContro
             }
         });
     }
+
+    @Override
+    public void onDataRoamingChanged(int subId, boolean enabled) {
+        if (subId != mSubId) {
+            Log.d(TAG, "onDataRoamingChanged - wrong subId : " + subId + " / " + enabled);
+            return;
+        }
+        update();
+    }
 }

src/com/android/settings/print/PrintSettingsFragment.java

@@ -28,6 +28,7 @@ import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.print.PrintJob;
 import android.print.PrintJobId;
 import android.print.PrintJobInfo;
@@ -45,6 +46,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.loader.app.LoaderManager.LoaderCallbacks;
 import androidx.loader.content.AsyncTaskLoader;
 import androidx.loader.content.Loader;
@@ -92,6 +94,22 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
     private PrintServicesController mPrintServicesController;
 
     private Button mAddNewServiceButton;
+    @VisibleForTesting
+    boolean mIsUiRestricted;
+
+    public PrintSettingsFragment() {
+        super(UserManager.DISALLOW_PRINTING);
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.print_settings;
+    }
 
     @Override
     public int getMetricsCategory() {
@@ -107,12 +125,19 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         View root = super.onCreateView(inflater, container, savedInstanceState);
-        addPreferencesFromResource(R.xml.print_settings);
+        mIsUiRestricted = isUiRestricted();
+        setupPreferences();
+        return root;
+    }
 
-        mActivePrintJobsCategory = (PreferenceCategory) findPreference(
+    @VisibleForTesting
-                PRINT_JOBS_CATEGORY);
+    void setupPreferences() {
-        mPrintServicesCategory = (PreferenceCategory) findPreference(
+        if (mIsUiRestricted) {
-                PRINT_SERVICES_CATEGORY);
+            return;
+        }
+
+        mActivePrintJobsCategory = (PreferenceCategory) findPreference(PRINT_JOBS_CATEGORY);
+        mPrintServicesCategory = (PreferenceCategory) findPreference(PRINT_SERVICES_CATEGORY);
         getPreferenceScreen().removePreference(mActivePrintJobsCategory);
 
         mPrintJobsController = new PrintJobsController();
@@ -120,20 +145,20 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
 
         mPrintServicesController = new PrintServicesController();
         getLoaderManager().initLoader(LOADER_ID_PRINT_SERVICES, null, mPrintServicesController);
-
-        return root;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        setHasOptionsMenu(true);
-        startSubSettingsIfNeeded();
     }
 
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        setupEmptyViews();
+    }
+
+    @VisibleForTesting
+    void setupEmptyViews() {
+        if (mIsUiRestricted) {
+            return;
+        }
+
         ViewGroup contentRoot = (ViewGroup) getListView().getParent();
         View emptyView = getActivity().getLayoutInflater().inflate(
                 R.layout.empty_print_state, contentRoot, false);
@@ -152,6 +177,23 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
         setEmptyView(emptyView);
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        startSettings();
+    }
+
+    @VisibleForTesting
+    void startSettings() {
+        if (mIsUiRestricted) {
+            getPreferenceScreen().removeAll();
+            return;
+        }
+
+        setHasOptionsMenu(true);
+        startSubSettingsIfNeeded();
+    }
+
     @Override
     protected String getIntentActionString() {
         return Settings.ACTION_PRINT_SETTINGS;

src/com/android/settings/print/ProfileSettingsPreferenceFragment.java

@@ -27,13 +27,17 @@ import android.widget.AdapterView;
 import android.widget.Spinner;
 
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.dashboard.profileselector.UserAdapter;
 
 /**
  * Base fragment class for per profile settings.
  */
-public abstract class ProfileSettingsPreferenceFragment extends SettingsPreferenceFragment {
+public abstract class ProfileSettingsPreferenceFragment extends RestrictedDashboardFragment {
+
+    public ProfileSettingsPreferenceFragment(String restrictionKey) {
+        super(restrictionKey);
+    }
 
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {

src/com/android/settings/wifi/tether/WifiTetherSettings.java

@@ -84,8 +84,10 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
     WifiTetherSSIDPreferenceController mSSIDPreferenceController;
     @VisibleForTesting
     WifiTetherPasswordPreferenceController mPasswordPreferenceController;
-    private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
+    @VisibleForTesting
-    private WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController;
+    WifiTetherSecurityPreferenceController mSecurityPreferenceController;
+    @VisibleForTesting
+    WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController;
     @VisibleForTesting
     WifiTetherAutoOffPreferenceController mWifiTetherAutoOffPreferenceController;
 
@@ -276,15 +278,16 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
     SoftApConfiguration buildNewConfig() {
         SoftApConfiguration currentConfig = mWifiTetherViewModel.getSoftApConfiguration();
         SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder(currentConfig);
-        int securityType = (mWifiTetherViewModel.isSpeedFeatureAvailable())
+        configBuilder.setSsid(mSSIDPreferenceController.getSSID());
+        int securityType =
+                mWifiTetherViewModel.isSpeedFeatureAvailable()
                         ? currentConfig.getSecurityType()
                         : mSecurityPreferenceController.getSecurityType();
-        configBuilder.setSsid(mSSIDPreferenceController.getSSID());
+        String passphrase =
-        if (securityType != SoftApConfiguration.SECURITY_TYPE_OPEN) {
+                securityType == SoftApConfiguration.SECURITY_TYPE_OPEN
-            configBuilder.setPassphrase(
+                        ? null
-                    mPasswordPreferenceController.getPasswordValidated(securityType),
+                        : mPasswordPreferenceController.getPasswordValidated(securityType);
-                    securityType);
+        configBuilder.setPassphrase(passphrase, securityType);
-        }
         if (!mWifiTetherViewModel.isSpeedFeatureAvailable()) {
             mMaxCompatibilityPrefController.setupMaximizeCompatibility(configBuilder);
         }

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java

@@ -16,6 +16,7 @@
 
 package com.android.settings.wifi.tether;
 
+import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_OPEN;
 import static android.net.wifi.SoftApConfiguration.SECURITY_TYPE_WPA3_SAE;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
@@ -125,9 +126,13 @@ public class WifiTetherSettingsTest {
     @Mock
     private WifiTetherSSIDPreferenceController mSSIDPreferenceController;
     @Mock
+    private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
+    @Mock
     private WifiTetherPasswordPreferenceController mPasswordPreferenceController;
     @Mock
     private WifiTetherAutoOffPreferenceController mWifiTetherAutoOffPreferenceController;
+    @Mock
+    private WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController;
 
     private WifiTetherSettings mSettings;
 
@@ -156,10 +161,13 @@ public class WifiTetherSettingsTest {
         mSettings.mMainSwitchBar = mMainSwitchBar;
         mSettings.mSSIDPreferenceController = mSSIDPreferenceController;
         when(mSSIDPreferenceController.getSSID()).thenReturn(SSID);
+        mSettings.mSecurityPreferenceController = mSecurityPreferenceController;
+        when(mSecurityPreferenceController.getSecurityType()).thenReturn(SECURITY_TYPE_WPA3_SAE);
         mSettings.mPasswordPreferenceController = mPasswordPreferenceController;
         when(mPasswordPreferenceController.getPasswordValidated(anyInt())).thenReturn(PASSWORD);
         mSettings.mWifiTetherAutoOffPreferenceController = mWifiTetherAutoOffPreferenceController;
         when(mWifiTetherAutoOffPreferenceController.isEnabled()).thenReturn(true);
+        mSettings.mMaxCompatibilityPrefController = mMaxCompatibilityPrefController;
         mSettings.mWifiTetherViewModel = mWifiTetherViewModel;
         when(mSettings.findPreference(KEY_WIFI_HOTSPOT_SECURITY)).thenReturn(mWifiHotspotSecurity);
         when(mSettings.findPreference(KEY_WIFI_HOTSPOT_SPEED)).thenReturn(mWifiHotspotSpeed);
@@ -359,6 +367,23 @@ public class WifiTetherSettingsTest {
         assertThat(newConfig.getBand()).isEqualTo(currentConfig.getBand());
     }
 
+    @Test
+    public void buildNewConfig_securityTypeChangeToOpen_setSecurityTypeCorrectly() {
+        SoftApConfiguration currentConfig = new SoftApConfiguration.Builder()
+                .setPassphrase(PASSWORD, SECURITY_TYPE_WPA3_SAE)
+                .setBand(BAND_2GHZ_5GHZ_6GHZ)
+                .build();
+        when(mWifiTetherViewModel.getSoftApConfiguration()).thenReturn(currentConfig);
+        when(mWifiTetherViewModel.isSpeedFeatureAvailable()).thenReturn(false);
+        doNothing().when(mMaxCompatibilityPrefController)
+                .setupMaximizeCompatibility(any(SoftApConfiguration.Builder.class));
+
+        when(mSecurityPreferenceController.getSecurityType()).thenReturn(SECURITY_TYPE_OPEN);
+        SoftApConfiguration newConfig = mSettings.buildNewConfig();
+
+        assertThat(newConfig.getSecurityType()).isEqualTo(SECURITY_TYPE_OPEN);
+    }
+
     @Test
     public void onRestartingChanged_restartingFalse_setLoadingFalse() {
         doNothing().when(mSettings).setLoading(anyBoolean(), anyBoolean());

tests/unit/src/com/android/settings/print/PrintSettingsFragmentTest.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.print;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.os.Looper;
+import android.view.View;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class PrintSettingsFragmentTest {
+    @Rule
+    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Spy
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    private PrintSettingsFragment mFragment;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+
+    @Before
+    public void setUp() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
+            mFragment = spy(new PrintSettingsFragment());
+            doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
+        });
+    }
+
+    @Test
+    public void setupPreferences_uiIsRestricted_doNotAddPreferences() {
+        mFragment.mIsUiRestricted = true;
+
+        mFragment.setupPreferences();
+
+        verify(mFragment, never()).findPreference(any(CharSequence.class));
+    }
+
+    @Test
+    public void setupEmptyViews_uiIsRestricted_doNotSetEmptyView() {
+        mFragment.mIsUiRestricted = true;
+
+        mFragment.setupEmptyViews();
+
+        verify(mFragment, never()).setEmptyView(any(View.class));
+    }
+
+    @Test
+    public void startSettings_uiIsRestricted_removeAllPreferences() {
+        mFragment.mIsUiRestricted = true;
+
+        mFragment.startSettings();
+
+        assertThat(mPreferenceScreen.getPreferenceCount()).isEqualTo(0);
+        verify(mFragment, never()).setHasOptionsMenu(true);
+    }
+}