From ead8a3572079aa5e38fe763726be15ded0875996 Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Tue, 22 Nov 2022 09:51:54 +0000 Subject: [PATCH] Revert "[Settings] configuration for hidding SIM lock 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: I870c0b53112db56b7bc80bfd585f6f7b3cf82737 Change-Id: Ie157c9d85b5cea9ded8c4b7928a10e7ae401ab09 --- res/xml/security_advanced_settings.xml | 2 -- src/com/android/settings/IccLockSettings.java | 5 ++-- .../security/SimLockPreferenceController.java | 5 ---- .../SimLockPreferenceControllerTest.java | 24 +------------------ 4 files changed, 3 insertions(+), 33 deletions(-) diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml index b36fc73fdd2..6d43fe77451 100644 --- a/res/xml/security_advanced_settings.xml +++ b/res/xml/security_advanced_settings.xml @@ -64,7 +64,6 @@ android:order="50" android:key="sim_lock_settings" android:title="@string/sim_lock_settings_category" - settings:isPreferenceVisible="@bool/config_show_sim_info" settings:controller="com.android.settings.security.SimLockPreferenceController"> diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 8e54e3196f7..71eb0f20e30 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -174,9 +174,8 @@ public class IccLockSettings extends SettingsPreferenceFragment public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (Utils.isMonkeyRunning() || - !SubscriptionUtil.isSimHardwareVisible(getContext())) { - finishFragment(); + if (Utils.isMonkeyRunning()) { + finish(); return; } diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java index 8429a9f352c..7cd01732400 100644 --- a/src/com/android/settings/security/SimLockPreferenceController.java +++ b/src/com/android/settings/security/SimLockPreferenceController.java @@ -28,7 +28,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.network.SubscriptionUtil; import java.util.List; @@ -51,10 +50,6 @@ public class SimLockPreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - if (!SubscriptionUtil.isSimHardwareVisible(mContext)) { - return UNSUPPORTED_ON_DEVICE; - } - final List subInfoList = mSubscriptionManager.getActiveSubscriptionInfoList(); diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index f38cc4948d4..ef5973c1d5b 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -22,11 +22,9 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; -import android.content.res.Resources; import android.os.PersistableBundle; import android.os.UserManager; import android.telephony.CarrierConfigManager; @@ -37,7 +35,6 @@ import android.telephony.TelephonyManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import org.junit.Before; @@ -69,7 +66,6 @@ public class SimLockPreferenceControllerTest { private SimLockPreferenceController mController; private Preference mPreference; private Context mContext; - private Resources mResources; @Before public void setUp() { @@ -80,28 +76,15 @@ public class SimLockPreferenceControllerTest { shadowApplication.setSystemService(Context.CARRIER_CONFIG_SERVICE, mCarrierManager); shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager); shadowApplication.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager); - mContext = spy(RuntimeEnvironment.application); - - mResources = spy(mContext.getResources()); - when(mContext.getResources()).thenReturn(mResources); - + mContext = RuntimeEnvironment.application; mController = new SimLockPreferenceController(mContext, "key"); mPreference = new Preference(mContext); mPreference.setKey(mController.getPreferenceKey()); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); } - @Test - public void isAvailable_notShowSimUi_false() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false); - - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE); - } - @Test public void isAvailable_notAdmin_false() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); when(mUserManager.isAdminUser()).thenReturn(false); assertThat(mController.getAvailabilityStatus()) @@ -110,7 +93,6 @@ public class SimLockPreferenceControllerTest { @Test public void isAvailable_simIccNotReady_false() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); when(mUserManager.isAdminUser()).thenReturn(true); assertThat(mController.getAvailabilityStatus()) @@ -142,7 +124,6 @@ public class SimLockPreferenceControllerTest { @Test public void displayPreference_simReady_enablePreference() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); mController.displayPreference(mScreen); assertThat(mPreference.isEnabled()).isFalse(); @@ -159,14 +140,12 @@ public class SimLockPreferenceControllerTest { @Test public void getPreferenceKey_whenGivenValue_returnsGivenValue() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); mController = new SimLockPreferenceController(mContext, "key"); assertThat(mController.getPreferenceKey()).isEqualTo("key"); } private void setupMockIcc() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); final List subscriptionInfoList = new ArrayList<>(); SubscriptionInfo info = mock(SubscriptionInfo.class); subscriptionInfoList.add(info); @@ -177,7 +156,6 @@ public class SimLockPreferenceControllerTest { } private void setupMockSimReady() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); final List subscriptionInfoList = new ArrayList<>(); SubscriptionInfo info = mock(SubscriptionInfo.class); subscriptionInfoList.add(info);