From 3b7d0d2e17ffb63c2804f34dd9914e30c07dd68b Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Tue, 22 Nov 2022 09:51:54 +0000 Subject: [PATCH 1/2] Revert "[Settings] configuration for hidding SIM remove 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: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d Change-Id: I5c52b841955f5be41ce861aca740147061fc7d3f --- res/xml/reset_dashboard_fragment.xml | 1 - src/com/android/settings/MainClear.java | 11 +---------- src/com/android/settings/ResetNetwork.java | 6 ------ .../settings/network/EraseEuiccDataController.java | 3 +-- .../src/com/android/settings/MainClearTest.java | 5 +---- 5 files changed, 3 insertions(+), 23 deletions(-) diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml index 25161a5a66d..9497c8fe7d7 100644 --- a/res/xml/reset_dashboard_fragment.xml +++ b/res/xml/reset_dashboard_fragment.xml @@ -37,7 +37,6 @@ 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/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); From a1c1bd0f81eac2474ec9ef7d47e8177686608e8d Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Tue, 22 Nov 2022 09:51:54 +0000 Subject: [PATCH 2/2] 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 | 3 --- res/xml/network_provider_settings.xml | 1 - .../network/MobileNetworkSummaryController.java | 3 +-- .../network/NetworkProviderCallsSmsController.java | 3 +-- .../network/NetworkProviderCallsSmsFragment.java | 3 +-- .../settings/network/NetworkProviderSettings.java | 11 ----------- .../settings/network/NetworkProviderSettingsTest.java | 5 +---- 7 files changed, 4 insertions(+), 25 deletions(-) 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" />