Merge "Fix possible NPE crash when adding new accounts in Settings." (ae00783d) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.content.pm.UserInfo;
		import android.graphics.drawable.Drawable;
		import android.os.RemoteException;
		@@ -343,7 +344,8 @@ public class RestrictedLockUtils {
		}
		DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
		Context.DEVICE_POLICY_SERVICE);
		if (dpm == null) {
		PackageManager pm = context.getPackageManager();
		if (!pm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN) \|\| dpm == null) {
		return null;
		}
		boolean isAccountTypeDisabled = false;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import static org.mockito.Mockito.when;
		import android.app.admin.DevicePolicyManager;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.content.pm.UserInfo;
		import android.os.UserManager;

		@@ -56,6 +57,8 @@ public class RestrictedLockUtilsTest {
		private DevicePolicyManager mDevicePolicyManager;
		@Mock
		private UserManager mUserManager;
		@Mock
		private PackageManager mPackageManager;
		@Mock(answer = Answers.RETURNS_DEEP_STUBS)
		private RestrictedLockUtils.Proxy mProxy;

		@@ -72,10 +75,31 @@ public class RestrictedLockUtilsTest {
		.thenReturn(mDevicePolicyManager);
		when(mContext.getSystemService(Context.USER_SERVICE))
		.thenReturn(mUserManager);
		when(mContext.getPackageManager())
		.thenReturn(mPackageManager);

		RestrictedLockUtils.sProxy = mProxy;
		}

		@Test
		public void checkIfDevicePolicyServiceDisabled_noEnforceAdminForManagedProfile() {
		when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(null);
		final EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfAccountManagementDisabled(
		mContext, "account_type", mUserId);

		assertThat(enforcedAdmin).isEqualTo(null);
		}

		@Test
		public void checkIfDeviceAdminFeatureDisabled_noEnforceAdminForManagedProfile() {
		when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN))
		.thenReturn(false);
		final EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfAccountManagementDisabled(
		mContext, "account_type", mUserId);

		assertThat(enforcedAdmin).isEqualTo(null);
		}

		@Test
		public void checkIfKeyguardFeaturesDisabled_noEnforcedAdminForManagedProfile() {
		setUpManagedProfile(mUserId, new ComponentName[] {mAdmin1, mAdmin2});