diff --git a/res/xml/mobile_network_list.xml b/res/xml/mobile_network_list.xml index 13f9a597132..01ddb28df53 100644 --- a/res/xml/mobile_network_list.xml +++ b/res/xml/mobile_network_list.xml @@ -20,9 +20,11 @@ android:key="mobile_network_list_screen" android:title="@string/network_settings_title"> - @@ -30,6 +32,6 @@ - + diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java index 0f76f24de56..bd3e2efbb6d 100644 --- a/src/com/android/settings/network/MobileNetworkSummaryController.java +++ b/src/com/android/settings/network/MobileNetworkSummaryController.java @@ -130,7 +130,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController } private void update() { - if (mPreference == null) { + if (mPreference == null || mPreference.isDisabledByAdmin()) { return; } refreshSummary(mPreference); diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java index 99c9134c77d..e24b0f22a5b 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java @@ -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)); + } }