Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA"

* changes:
  Revert "[Settings] configuration for hidding SIM provider UI"
  Revert "[Settings] configuration for hidding SIM remove UI"
  Revert "[Settings] configuration for hidding SIM settings UI"
  Revert "[Settings] configuration for hidding SIM lock UI"
  Revert "[Settings] configuration for hidding SIM notification UI"
  Revert "[Settings] configuration for hidding SIM related UI"

res/values/config.xml

@@ -626,8 +626,4 @@
         <item>@string/config_settingsintelligence_package_name</item>
         <item>android.uid.system:1000</item>
     </string-array>
-
-    <!-- Whether sim related information is visible to the end user. -->
-    <bool name="config_show_sim_info">true</bool>
-
 </resources>

res/xml/my_device_info.xml

@@ -57,7 +57,6 @@
             android:order="3"
             android:title="@string/status_number"
             android:summary="@string/summary_placeholder"
-            settings:isPreferenceVisible="@bool/config_show_sim_info"
             settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"
             settings:enableCopying="true"/>
     </PreferenceCategory>
@@ -99,7 +98,6 @@
             android:title="@string/sim_status_title"
             settings:keywords="@string/keywords_sim_status"
             android:summary="@string/summary_placeholder"
-            settings:isPreferenceVisible="@bool/config_show_sim_info"
             settings:enableCopying="true"/>
 
         <!-- Model & hardware -->
@@ -121,7 +119,6 @@
             android:summary="@string/summary_placeholder"
             settings:keywords="@string/keywords_imei_info"
             settings:enableCopying="true"
-            settings:isPreferenceVisible="@bool/config_show_sim_info"
             settings:controller="com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController"/>
 
         <!-- Android version -->

res/xml/network_provider_internet.xml

@@ -37,7 +37,6 @@
         android:icon="@drawable/ic_calls_sms"
         android:order="-20"
         android:summary="@string/summary_placeholder"
-        settings:isPreferenceVisible="@bool/config_show_sim_info"
         settings:allowDividerBelow="true"
         settings:keywords="@string/calls_and_sms"
         settings:useAdminDisabledSummary="true" />
@@ -50,7 +49,6 @@
         android:order="-15"
         settings:keywords="@string/keywords_more_mobile_networks"
         settings:userRestriction="no_config_mobile_networks"
-        settings:isPreferenceVisible="@bool/config_show_sim_info"
         settings:allowDividerAbove="true"
         settings:useAdminDisabledSummary="true" />
 
@@ -68,7 +66,6 @@
         android:persistent="false"
         android:order="19"
         settings:userRestriction="no_config_mobile_networks"
-        settings:isPreferenceVisible="@bool/config_show_sim_info"
         settings:useAdminDisabledSummary="true" />
 
     <com.android.settingslib.RestrictedPreference

res/xml/network_provider_settings.xml

@@ -46,7 +46,6 @@
         android:key="provider_model_mobile_network"
         android:title="@string/summary_placeholder"
         android:layout="@layout/preference_category_no_label"
-        settings:isPreferenceVisible="@bool/config_show_sim_info"
         settings:controller="com.android.settings.network.NetworkMobileProviderController"/>
 
     <com.android.settingslib.RestrictedSwitchPreference

res/xml/reset_dashboard_fragment.xml

@@ -37,7 +37,6 @@
     <Preference
         android:key="erase_euicc_data"
         android:title="@string/reset_esim_title"
-        settings:isPreferenceVisible="@bool/config_show_sim_info"
         settings:controller="com.android.settings.network.EraseEuiccDataController" />
 
     <!-- Factory reset -->

res/xml/security_advanced_settings.xml

@@ -64,7 +64,6 @@
         android:order="50"
         android:key="sim_lock_settings"
         android:title="@string/sim_lock_settings_category"
-        settings:isPreferenceVisible="@bool/config_show_sim_info"
         settings:controller="com.android.settings.security.SimLockPreferenceController">
 
         <intent
@@ -104,7 +103,6 @@
         android:key="confirm_sim_deletion"
         android:title="@string/confirm_sim_deletion_title"
         android:summary="@string/confirm_sim_deletion_description"
-        settings:isPreferenceVisible="@bool/config_show_sim_info"
         settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController" />
 
     <!-- work profile security section -->

src/com/android/settings/IccLockSettings.java

@@ -174,9 +174,8 @@ public class IccLockSettings extends SettingsPreferenceFragment
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (Utils.isMonkeyRunning() ||
+        if (Utils.isMonkeyRunning()) {
-                !SubscriptionUtil.isSimHardwareVisible(getContext())) {
+            finish();
-            finishFragment();
             return;
         }
 

src/com/android/settings/MainClear.java

@@ -64,7 +64,6 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
-import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.ConfirmLockPattern;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -382,14 +381,6 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
         mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(this);
     }
 
-    /**
-     * Whether to show any UI which is SIM related.
-     */
-    @VisibleForTesting
-    boolean showAnySubscriptionInfo(Context context) {
-        return (context != null) && SubscriptionUtil.isSimHardwareVisible(context);
-    }
-
     /**
      * Whether to show strings indicating that the eUICC will be wiped.
      *
@@ -399,7 +390,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
     @VisibleForTesting
     boolean showWipeEuicc() {
         Context context = getContext();
-        if (!showAnySubscriptionInfo(context) || !isEuiccEnabled(context)) {
+        if (!isEuiccEnabled(context)) {
             return false;
         }
         ContentResolver cr = context.getContentResolver();

src/com/android/settings/ResetNetwork.java

@@ -235,9 +235,6 @@ public class ResetNetwork extends InstrumentedFragment {
     }
 
     private List<SubscriptionInfo> getActiveSubscriptionInfoList() {
-        if (!SubscriptionUtil.isSimHardwareVisible(getActivity())) {
-            return Collections.emptyList();
-        }
         SubscriptionManager mgr = getActivity().getSystemService(SubscriptionManager.class);
         if (mgr == null) {
             Log.w(TAG, "No SubscriptionManager");
@@ -267,9 +264,6 @@ public class ResetNetwork extends InstrumentedFragment {
     }
 
     private boolean showEuiccSettings(Context context) {
-        if (!SubscriptionUtil.isSimHardwareVisible(context)) {
-            return false;
-        }
         EuiccManager euiccManager =
                 (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
         if (!euiccManager.isEnabled()) {

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

@@ -29,7 +29,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.network.SubscriptionUtil;
 import com.android.settingslib.DeviceInfoUtils;
 
 import java.util.ArrayList;
@@ -52,8 +51,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
 
     @Override
     public int getAvailabilityStatus() {
-        return SubscriptionUtil.isSimHardwareVisible(mContext) ?
+        return mTelephonyManager.isVoiceCapable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-                AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
@@ -81,9 +79,6 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        if (!SubscriptionUtil.isSimHardwareVisible(mContext)) {
-            return;
-        }
         final Preference preference = screen.findPreference(getPreferenceKey());
         final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);
         mPreferenceList.add(preference);

src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java

@@ -33,7 +33,6 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deviceinfo.PhoneNumberSummaryPreference;
-import com.android.settings.network.SubscriptionUtil;
 import com.android.settingslib.Utils;
 
 import java.util.ArrayList;
@@ -64,9 +63,6 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        if (!SubscriptionUtil.isSimHardwareVisible(mContext)) {
-            return;
-        }
         final Preference preference = screen.findPreference(getPreferenceKey());
         final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY);
 
@@ -123,8 +119,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
 
     @Override
     public int getAvailabilityStatus() {
-        return SubscriptionUtil.isSimHardwareVisible(mContext) &&
+        return mContext.getSystemService(UserManager.class).isAdminUser()
-                mContext.getSystemService(UserManager.class).isAdminUser()
                 && !Utils.isWifiOnly(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 

src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java

@@ -29,7 +29,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.network.SubscriptionUtil;
 import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
 
 import java.util.ArrayList;
@@ -60,18 +59,9 @@ public class SimStatusPreferenceController extends
         return KEY_SIM_STATUS;
     }
 
-    @Override
-    public boolean isAvailable() {
-        return SubscriptionUtil.isSimHardwareVisible(mContext) &&
-                super.isAvailable();
-    }
-
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        if (!SubscriptionUtil.isSimHardwareVisible(mContext)) {
-            return;
-        }
         final Preference preference = screen.findPreference(getPreferenceKey());
         if (!isAvailable() || preference == null || !preference.isVisible()) {
             return;

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

@@ -51,8 +51,7 @@ public class EraseEuiccDataController extends BasePreferenceController {
 
     @Override
     public int getAvailabilityStatus() {
-        return SubscriptionUtil.isSimHardwareVisible(mContext) &&
+        return mContext.getPackageManager().hasSystemFeature(
-                mContext.getPackageManager().hasSystemFeature(
                 PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE
                 : UNSUPPORTED_ON_DEVICE;
     }

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

@@ -60,10 +60,6 @@ public class MobileNetworkListFragment extends DashboardFragment {
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        if (!SubscriptionUtil.isSimHardwareVisible(getContext())) {
-            finish();
-            return controllers;
-        }
 
         NetworkProviderSimsCategoryController simCategoryPrefCtrl =
                 new NetworkProviderSimsCategoryController(context, KEY_PREFERENCE_CATEGORY_SIM,
@@ -92,8 +88,7 @@ public class MobileNetworkListFragment extends DashboardFragment {
 
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
-                    return SubscriptionUtil.isSimHardwareVisible(context) &&
+                    return context.getSystemService(UserManager.class).isAdminUser();
-                            context.getSystemService(UserManager.class).isAdminUser();
                 }
             };
 }

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

@@ -206,8 +206,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
 
     @Override
     public boolean isAvailable() {
-        return SubscriptionUtil.isSimHardwareVisible(mContext) &&
+        return !Utils.isWifiOnly(mContext) && mUserManager.isAdminUser();
-                !Utils.isWifiOnly(mContext) && mUserManager.isAdminUser();
     }
 
     @Override

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

@@ -190,8 +190,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
 
     @Override
     public boolean isAvailable() {
-        return SubscriptionUtil.isSimHardwareVisible(mContext) &&
+        return mUserManager.isAdminUser();
-                mUserManager.isAdminUser();
     }
 
     @Override

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

@@ -100,8 +100,7 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment {
 
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
-                    return SubscriptionUtil.isSimHardwareVisible(context) &&
+                    return context.getSystemService(UserManager.class).isAdminUser();
-                            context.getSystemService(UserManager.class).isAdminUser();
                 }
             };
 }

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

@@ -341,18 +341,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
         }
     }
 
-    /**
-     * Whether to show any UI which is SIM related.
-     */
-    @VisibleForTesting
-    boolean showAnySubscriptionInfo(Context context) {
-        return (context != null) && SubscriptionUtil.isSimHardwareVisible(context);
-    }
-
     private void addNetworkMobileProviderController() {
-        if (!showAnySubscriptionInfo(getContext())) {
-            return;
-        }
         if (mNetworkMobileProviderController == null) {
             mNetworkMobileProviderController = new NetworkMobileProviderController(
                     getContext(), PREF_KEY_PROVIDER_MOBILE_NETWORK);

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

@@ -86,14 +86,6 @@ public class SubscriptionUtil {
         return subscriptions;
     }
 
-    /**
-     * Check if SIM hardware is visible to the end user.
-     */
-    public static boolean isSimHardwareVisible(Context context) {
-        return context.getResources()
-            .getBoolean(R.bool.config_show_sim_info);
-    }
-
     @VisibleForTesting
     static boolean isInactiveInsertedPSim(UiccSlotInfo slotInfo) {
         if (slotInfo == null)  {

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

@@ -120,10 +120,6 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings {
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        if (!SubscriptionUtil.isSimHardwareVisible(context)) {
-            finish();
-            return Arrays.asList();
-        }
         if (getArguments() == null) {
             Intent intent = getIntent();
             if (intent != null) {
@@ -402,8 +398,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings {
                 /** suppress full page if user is not admin */
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
-                    return SubscriptionUtil.isSimHardwareVisible(context) &&
+                    return context.getSystemService(UserManager.class).isAdminUser();
-                            context.getSystemService(UserManager.class).isAdminUser();
                 }
             };
 

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

@@ -261,9 +261,6 @@ public class MobileNetworkUtils {
      * the user has enabled development mode.
      */
     public static boolean showEuiccSettings(Context context) {
-        if (!SubscriptionUtil.isSimHardwareVisible(context)) {
-            return false;
-        }
         long timeForAccess = SystemClock.elapsedRealtime();
         try {
             Boolean isShow = ((Future<Boolean>) ThreadUtils.postOnBackgroundThread(() -> {
@@ -1013,10 +1010,6 @@ public class MobileNetworkUtils {
     }
 
     public static void launchMobileNetworkSettings(Context context, SubscriptionInfo info) {
-        if (!SubscriptionUtil.isSimHardwareVisible(context)) {
-            Log.e(TAG, "launchMobileNetworkSettings fail, device without such UI.");
-            return;
-        }
         final int subId = info.getSubscriptionId();
         if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             Log.d(TAG, "launchMobileNetworkSettings fail, subId is invalid.");

src/com/android/settings/security/SimLockPreferenceController.java

@@ -28,7 +28,6 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.network.SubscriptionUtil;
 
 import java.util.List;
 
@@ -51,10 +50,6 @@ public class SimLockPreferenceController extends BasePreferenceController {
 
     @Override
     public int getAvailabilityStatus() {
-        if (!SubscriptionUtil.isSimHardwareVisible(mContext)) {
-            return UNSUPPORTED_ON_DEVICE;
-        }
-
         final List<SubscriptionInfo> subInfoList =
                 mSubscriptionManager.getActiveSubscriptionInfoList();
 

src/com/android/settings/sim/SimDialogActivity.java

@@ -35,7 +35,6 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
-import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.network.telephony.SubscriptionActionDialogActivity;
 
 import java.util.List;
@@ -66,11 +65,6 @@ public class SimDialogActivity extends FragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (!SubscriptionUtil.isSimHardwareVisible(this)) {
-            Log.d(TAG, "Not support on device without SIM.");
-            finish();
-            return;
-        }
         getWindow().addSystemFlags(
                 WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
         showOrUpdateDialog();

src/com/android/settings/sim/SimSelectNotification.java

@@ -77,10 +77,6 @@ public class SimSelectNotification extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (!SubscriptionUtil.isSimHardwareVisible(context)) {
-            Log.w(TAG, "Received unexpected intent with null action.");
-            return;
-        }
         String action = intent.getAction();
 
         if (action == null) {

src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java

@@ -38,7 +38,6 @@ import androidx.core.content.ContextCompat;
 
 import com.android.settings.R;
 import com.android.settings.core.SettingsBaseActivity;
-import com.android.settings.network.SubscriptionUtil;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -49,7 +48,6 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.util.concurrent.Executors;
 
 public class SmartForwardingActivity extends SettingsBaseActivity {
-    static final String LOG_TAG = SmartForwardingActivity.class.toString();
     final ListeningExecutorService service =
             MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());
 
@@ -57,12 +55,6 @@ public class SmartForwardingActivity extends SettingsBaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (!SubscriptionUtil.isSimHardwareVisible(this)) {
-            Log.d(LOG_TAG, "Not support on device without SIM.");
-            finish();
-            return;
-        }
-
         final Toolbar toolbar = findViewById(R.id.action_bar);
         toolbar.setVisibility(View.VISIBLE);
         setActionBar(toolbar);
@@ -174,4 +166,4 @@ public class SmartForwardingActivity extends SettingsBaseActivity {
                 .create();
         mDialog.show();
     }
-}
+}

tests/robotests/src/com/android/settings/MainClearTest.java

@@ -102,10 +102,7 @@ public class MainClearTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mMainClear = spy(new MainClear() {
+        mMainClear = spy(new MainClear());
-            @Override
-            boolean showAnySubscriptionInfo(Context context) { return true; }
-        });
         mActivity = Robolectric.setupActivity(FragmentActivity.class);
         mShadowActivity = Shadows.shadowOf(mActivity);
         UserManager userManager = mActivity.getSystemService(UserManager.class);

tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java

@@ -29,7 +29,6 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.os.UserManager;
 import android.telephony.TelephonyManager;
 
@@ -70,18 +69,12 @@ public class ImeiInfoPreferenceControllerTest {
     private PreferenceCategory mCategory;
 
     private Context mContext;
-    private Resources mResources;
     private ImeiInfoPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
-
-        mResources = spy(mContext.getResources());
-        when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
-
         doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
         mController = spy(new ImeiInfoPreferenceController(mContext, "imei_info"));
         mController.setHost(mFragment);

tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java

@@ -25,7 +25,6 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.os.UserManager;
-import android.content.res.Resources;
 import android.telephony.TelephonyManager;
 
 import androidx.fragment.app.Fragment;
@@ -65,18 +64,12 @@ public class SimStatusPreferenceControllerTest {
     private PreferenceCategory mCategory;
 
     private Context mContext;
-    private Resources mResources;
     private SimStatusPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
-
-        mResources = spy(mContext.getResources());
-        when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
-
         doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
         mController = spy(new SimStatusPreferenceController(mContext, mFragment));
         doReturn(true).when(mController).isAvailable();

tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java

@@ -21,10 +21,8 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.os.UserManager;
 
-import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
 
 import org.junit.Before;
@@ -40,8 +38,6 @@ public class MobileNetworkListFragmentTest {
     @Mock
     private Context mContext;
     @Mock
-    private Resources mResources;
-    @Mock
     private UserManager mUserManager;
 
     private MobileNetworkListFragment mFragment;
@@ -59,9 +55,6 @@ public class MobileNetworkListFragmentTest {
         final BaseSearchIndexProvider provider =
                 (BaseSearchIndexProvider) mFragment.SEARCH_INDEX_DATA_PROVIDER;
 
-        when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
-
         final Object obj = ReflectionHelpers.callInstanceMethod(provider, "isPageSearchEnabled",
                 ReflectionHelpers.ClassParameter.from(Context.class, mContext));
         final boolean isEnabled = (Boolean) obj;
@@ -76,9 +69,6 @@ public class MobileNetworkListFragmentTest {
         final BaseSearchIndexProvider provider =
                 (BaseSearchIndexProvider) mFragment.SEARCH_INDEX_DATA_PROVIDER;
 
-        when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
-
         final Object obj = ReflectionHelpers.callInstanceMethod(provider, "isPageSearchEnabled",
                 ReflectionHelpers.ClassParameter.from(Context.class, mContext));
         final boolean isEnabled = (Boolean) obj;

tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java

@@ -145,10 +145,7 @@ public class NetworkProviderSettingsTest {
 
     @Before
     public void setUp() {
-        mNetworkProviderSettings = spy(new NetworkProviderSettings() {
+        mNetworkProviderSettings = spy(new NetworkProviderSettings());
-            @Override
-            boolean showAnySubscriptionInfo(Context context) { return true; }
-        });
         doReturn(mContext).when(mNetworkProviderSettings).getContext();
         doReturn(mPreferenceManager).when(mNetworkProviderSettings).getPreferenceManager();
         doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);

tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java

@@ -29,7 +29,6 @@ import static org.mockito.Mockito.when;
 import android.app.Activity;
 import android.app.usage.NetworkStatsManager;
 import android.content.Context;
-import android.content.res.Resources;
 import android.net.NetworkPolicyManager;
 import android.os.Bundle;
 import android.os.UserManager;
@@ -38,7 +37,6 @@ import android.telephony.TelephonyManager;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.android.settings.R;
 import com.android.settings.datausage.DataUsageSummaryPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
@@ -70,18 +68,12 @@ public class MobileNetworkSettingsTest {
     private FragmentActivity mActivity;
 
     private Context mContext;
-    private Resources mResources;
     private MobileNetworkSettings mFragment;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
-
-        mResources = spy(mContext.getResources());
-        when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
-
         when(mActivity.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
         when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
         when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager);

tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java

@@ -22,11 +22,9 @@ import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.os.PersistableBundle;
 import android.os.UserManager;
 import android.telephony.CarrierConfigManager;
@@ -37,7 +35,6 @@ import android.telephony.TelephonyManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
@@ -69,7 +66,6 @@ public class SimLockPreferenceControllerTest {
     private SimLockPreferenceController mController;
     private Preference mPreference;
     private Context mContext;
-    private Resources mResources;
 
     @Before
     public void setUp() {
@@ -80,28 +76,15 @@ public class SimLockPreferenceControllerTest {
         shadowApplication.setSystemService(Context.CARRIER_CONFIG_SERVICE, mCarrierManager);
         shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager);
         shadowApplication.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
-        mContext = spy(RuntimeEnvironment.application);
+        mContext = RuntimeEnvironment.application;
-
-        mResources = spy(mContext.getResources());
-        when(mContext.getResources()).thenReturn(mResources);
-
         mController = new SimLockPreferenceController(mContext, "key");
         mPreference = new Preference(mContext);
         mPreference.setKey(mController.getPreferenceKey());
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
     }
 
-    @Test
-    public void isAvailable_notShowSimUi_false() {
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false);
-
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
-    }
-
     @Test
     public void isAvailable_notAdmin_false() {
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
         when(mUserManager.isAdminUser()).thenReturn(false);
 
         assertThat(mController.getAvailabilityStatus())
@@ -110,7 +93,6 @@ public class SimLockPreferenceControllerTest {
 
     @Test
     public void isAvailable_simIccNotReady_false() {
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
         when(mUserManager.isAdminUser()).thenReturn(true);
 
         assertThat(mController.getAvailabilityStatus())
@@ -142,7 +124,6 @@ public class SimLockPreferenceControllerTest {
 
     @Test
     public void displayPreference_simReady_enablePreference() {
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
         mController.displayPreference(mScreen);
 
         assertThat(mPreference.isEnabled()).isFalse();
@@ -159,14 +140,12 @@ public class SimLockPreferenceControllerTest {
 
     @Test
     public void getPreferenceKey_whenGivenValue_returnsGivenValue() {
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
         mController = new SimLockPreferenceController(mContext, "key");
 
         assertThat(mController.getPreferenceKey()).isEqualTo("key");
     }
 
     private void setupMockIcc() {
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
         final List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();
         SubscriptionInfo info = mock(SubscriptionInfo.class);
         subscriptionInfoList.add(info);
@@ -177,7 +156,6 @@ public class SimLockPreferenceControllerTest {
     }
 
     private void setupMockSimReady() {
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
         final List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();
         SubscriptionInfo info = mock(SubscriptionInfo.class);
         subscriptionInfoList.add(info);

tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java

@@ -42,7 +42,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.clearInvocations;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -138,7 +137,6 @@ public class SimSelectNotificationTest {
         when(mSubInfo.getDisplayName()).thenReturn(mFakeDisplayName);
         when(mContext.getResources()).thenReturn(mResources);
 
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
         when(mResources.getText(R.string.enable_sending_mms_notification_title))
                 .thenReturn(mFakeNotificationTitle);
         when(mResources.getText(R.string.enable_mms_notification_channel_title))
@@ -238,9 +236,6 @@ public class SimSelectNotificationTest {
 
     @Test
     public void onReceivePrimarySubListChange_WithDismissExtra_shouldDismiss() {
-        doReturn(mExecutor).when(mActivity).getMainExecutor();
-        SimDialogProhibitService.supportDismiss(mActivity);
-
         Intent intent = new Intent(TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED);
         intent.putExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE,
                 EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA);

tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java

@@ -25,14 +25,11 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
-import com.android.settings.R;
-
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -61,8 +58,6 @@ public class SubscriptionUtilTest {
     private SubscriptionManager mSubMgr;
     @Mock
     private TelephonyManager mTelMgr;
-    @Mock
-    private Resources mResources;
 
 
     @Before
@@ -448,22 +443,4 @@ public class SubscriptionUtilTest {
     public void isInactiveInsertedPSim_nullSubInfo_doesNotCrash() {
         assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse();
     }
-
-    @Test
-    public void isSimHardwareVisible_configAsInvisible_returnFalse() {
-        when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getBoolean(R.bool.config_show_sim_info))
-                .thenReturn(false);
-
-        assertThat(SubscriptionUtil.isSimHardwareVisible(mContext)).isFalse();
-    }
-
-    @Test
-    public void isSimHardwareVisible_configAsVisible_returnTrue() {
-        when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getBoolean(R.bool.config_show_sim_info))
-                .thenReturn(true);
-
-        assertTrue(SubscriptionUtil.isSimHardwareVisible(mContext));
-    }
 }