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

Commit 4685c785 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev

parents 5a690f3c 482415d3

res/xml/mobile_network_list.xml

+4 −2
Original line number Diff line number Diff line
@@ -20,9 +20,11 @@ 
    android:key="mobile_network_list_screen"

    android:title="@string/network_settings_title">



    <Preference

    <com.android.settingslib.RestrictedPreference

        android:key="add_more"

        settings:isPreferenceVisible="false"

        settings:userRestriction="no_config_mobile_networks"

        settings:useAdminDisabledSummary="true"

        android:title="@string/mobile_network_list_add_more"

        android:icon="@drawable/ic_menu_add_activated_tint"

        android:order="100" >
@@ -30,6 +32,6 @@ 
            <extra android:name="android.telephony.euicc.extra.FORCE_PROVISION"

                   android:value="true"/>

        </intent>

    </Preference>

    </com.android.settingslib.RestrictedPreference>



</PreferenceScreen>

src/com/android/settings/network/MobileNetworkSummaryController.java

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController 
    }



    private void update() {

        if (mPreference == null) {

        if (mPreference == null || mPreference.isDisabledByAdmin()) {

            return;

        }

        refreshSummary(mPreference);

tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java

+9 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.text.TextUtils; 


import com.android.settings.network.telephony.MobileNetworkActivity;

import com.android.settings.widget.AddPreference;

import com.android.settingslib.RestrictedLockUtils;



import org.junit.After;

import org.junit.Before;
@@ -373,4 +374,12 @@ public class MobileNetworkSummaryControllerTest { 
        verify(mPreference, atLeastOnce()).setAddWidgetEnabled(captor.capture());

        assertThat(captor.getValue()).isTrue();

    }



    @Test

    public void onResume_disabledByAdmin_prefStaysDisabled() {

        mPreference.setDisabledByAdmin(new RestrictedLockUtils.EnforcedAdmin());

        mController.displayPreference(mPreferenceScreen);

        mController.onResume();

        verify(mPreference, never()).setEnabled(eq(true));

    }

}