Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52bae429 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a357 am: 2decf2ae 

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



Change-Id: I57d2afd3af39506a35ea369ab561d02d039884ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ee0d947 2decf2ae

res/xml/security_advanced_settings.xml

+0 −2
Original line number Diff line number Diff line
@@ -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">



        <intent
@@ -104,7 +103,6 @@ 
        android:key="confirm_sim_deletion"

        android:title="@string/confirm_sim_deletion_title"

        android:summary="@string/confirm_sim_deletion_description"

        settings:isPreferenceVisible="@bool/config_show_sim_info"

        settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController" />



    <!-- work profile security section -->

src/com/android/settings/IccLockSettings.java

+2 −3
Original line number Diff line number Diff line
@@ -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;

        }

src/com/android/settings/security/SimLockPreferenceController.java

+0 −5
Original line number Diff line number Diff line
@@ -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<SubscriptionInfo> subInfoList =

                mSubscriptionManager.getActiveSubscriptionInfoList();

tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java

+1 −23
Original line number Diff line number Diff line
@@ -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<SubscriptionInfo> 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<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();

        SubscriptionInfo info = mock(SubscriptionInfo.class);

        subscriptionInfoList.add(info);