Revert "[Settings] configuration for hidding SIM provider 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: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: If1951dde860bb49e3ea4cd5603ed92ef18bd1f0d

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

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

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