Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev (a88e1b6c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/apn/ApnEditor.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.database.Cursor;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.PersistableBundle;
		import android.os.UserManager;
		import android.provider.Telephony;
		import android.telephony.CarrierConfigManager;
		import android.telephony.SubscriptionInfo;
		@@ -281,6 +282,11 @@ public class ApnEditor extends SettingsPreferenceFragment
		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);
		if (isUserRestricted()) {
		Log.e(TAG, "This setting isn't available due to user restriction.");
		finish();
		return;
		}

		setLifecycleForAllControllers();

		@@ -1453,6 +1459,23 @@ public class ApnEditor extends SettingsPreferenceFragment
		return apnData;
		}

		@VisibleForTesting
		boolean isUserRestricted() {
		UserManager userManager = getContext().getSystemService(UserManager.class);
		if (userManager == null) {
		return false;
		}
		if (!userManager.isAdminUser()) {
		Log.e(TAG, "User is not an admin");
		return true;
		}
		if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
		Log.e(TAG, "User is not allowed to configure mobile network");
		return true;
		}
		return false;
		}

		@VisibleForTesting
		static class ApnData {
		/**

tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java

+28 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import android.content.res.Resources;
		import android.database.Cursor;
		import android.net.Uri;
		import android.os.PersistableBundle;
		import android.os.UserManager;
		import android.telephony.CarrierConfigManager;
		import android.view.KeyEvent;
		import android.view.Menu;
		@@ -102,6 +103,8 @@ public class ApnEditorTest {
		@Mock
		private FragmentActivity mActivity;
		@Mock
		private UserManager mUserManager;
		@Mock
		private ProxySubscriptionManager mProxySubscriptionMgr;
		@Mock
		private CarrierConfigManager mCarrierConfigManager;
		@@ -129,6 +132,10 @@ public class ApnEditorTest {
		doReturn(mContext.getTheme()).when(mActivity).getTheme();
		doReturn(mContext.getContentResolver()).when(mActivity).getContentResolver();

		doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
		doReturn(true).when(mUserManager).isAdminUser();
		doReturn(false).when(mUserManager)
		.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
		doReturn(mCarrierConfigManager).when(mContext)
		.getSystemService(Context.CARRIER_CONFIG_SERVICE);
		doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt());
		@@ -471,6 +478,27 @@ public class ApnEditorTest {
		assertThat(ApnEditor.formatInteger("not an int")).isEqualTo("not an int");
		}

		@Test
		@Config(shadows = ShadowFragment.class)
		public void onCreate_notAdminUser_shouldFinish() {
		doReturn(false).when(mUserManager).isAdminUser();

		mApnEditorUT.onCreate(null);

		verify(mApnEditorUT).finish();
		}

		@Test
		@Config(shadows = ShadowFragment.class)
		public void onCreate_hasUserRestriction_shouldFinish() {
		doReturn(true).when(mUserManager)
		.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);

		mApnEditorUT.onCreate(null);

		verify(mApnEditorUT).finish();
		}

		@Test
		@Config(shadows = ShadowFragment.class)
		public void onCreate_noAction_shouldFinishAndNoCrash() {