Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Ic919498fda4172ede68fcd431b8bdd18056fada6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

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