diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml index c9c576e6b1b..07e797a07c1 100644 --- a/res/xml/network_provider_internet.xml +++ b/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" /> diff --git a/src/com/android/settings/MainClear.java b/src/com/android/settings/MainClear.java index 1434d7216a9..2b0f01036ea 100644 --- a/src/com/android/settings/MainClear.java +++ b/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(); diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index 7635041ee46..688e2abe71e 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -235,9 +235,6 @@ public class ResetNetwork extends InstrumentedFragment { } private List 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()) { diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java index 091b6d7748c..b1f964b2190 100644 --- a/src/com/android/settings/network/EraseEuiccDataController.java +++ b/src/com/android/settings/network/EraseEuiccDataController.java @@ -51,8 +51,7 @@ public class EraseEuiccDataController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - return SubscriptionUtil.isSimHardwareVisible(mContext) && - mContext.getPackageManager().hasSystemFeature( + return mContext.getPackageManager().hasSystemFeature( PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; } diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java index 61dd079cb35..1a85a7fa341 100644 --- a/src/com/android/settings/network/MobileNetworkSummaryController.java +++ b/src/com/android/settings/network/MobileNetworkSummaryController.java @@ -206,8 +206,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController @Override public boolean isAvailable() { - return SubscriptionUtil.isSimHardwareVisible(mContext) && - !Utils.isWifiOnly(mContext) && mUserManager.isAdminUser(); + return !Utils.isWifiOnly(mContext) && mUserManager.isAdminUser(); } @Override diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsController.java b/src/com/android/settings/network/NetworkProviderCallsSmsController.java index 585c99e0bbe..c8b1c49b7bf 100644 --- a/src/com/android/settings/network/NetworkProviderCallsSmsController.java +++ b/src/com/android/settings/network/NetworkProviderCallsSmsController.java @@ -190,8 +190,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl @Override public boolean isAvailable() { - return SubscriptionUtil.isSimHardwareVisible(mContext) && - mUserManager.isAdminUser(); + return mUserManager.isAdminUser(); } @Override diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java index b2cf74e0a82..aad9b10403c 100644 --- a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java +++ b/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) && - context.getSystemService(UserManager.class).isAdminUser(); + return context.getSystemService(UserManager.class).isAdminUser(); } }; } diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index 1f79b20fdd7..1c480e05735 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/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); diff --git a/tests/robotests/src/com/android/settings/MainClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java index 9795092a657..ec33fadfd02 100644 --- a/tests/robotests/src/com/android/settings/MainClearTest.java +++ b/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() { - @Override - boolean showAnySubscriptionInfo(Context context) { return true; } - }); + mMainClear = spy(new MainClear()); mActivity = Robolectric.setupActivity(FragmentActivity.class); mShadowActivity = Shadows.shadowOf(mActivity); UserManager userManager = mActivity.getSystemService(UserManager.class); diff --git a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java index 632b6cf4874..5122def9843 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java @@ -145,10 +145,7 @@ public class NetworkProviderSettingsTest { @Before public void setUp() { - mNetworkProviderSettings = spy(new NetworkProviderSettings() { - @Override - boolean showAnySubscriptionInfo(Context context) { return true; } - }); + mNetworkProviderSettings = spy(new NetworkProviderSettings()); doReturn(mContext).when(mNetworkProviderSettings).getContext(); doReturn(mPreferenceManager).when(mNetworkProviderSettings).getPreferenceManager(); doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);