Revert "[Settings] configuration for hidding SIM related UI"

Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Idb765be594a55e9f26bf378656d6b18c8f3e37c0

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 -->

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/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)  {

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/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));
-    }
 }