Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
am: 57b00e28ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512 Change-Id: I7d8a257424acaf097339b062621eb85c515ae408 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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() {
|
||||
|
Reference in New Issue
Block a user