Merge "Switching to pre-created users should not be supported." (873cc29e) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/UserInfo.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -362,6 +362,10 @@ public class UserInfo implements Parcelable {
		// Don't support switching to an ephemeral user with removal in progress.
		return false;
		}
		if (preCreated) {
		// Don't support switching to pre-created users until they become "real" users.
		return false;
		}
		return !isProfile();
		}

+19 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,25 @@ public class UserManagerServiceUserInfoTest {
		assertTrue(mUserManagerService.isUserOfType(testId, typeName));
		}

		/** Test UserInfo.supportsSwitchTo() for precreated users. */
		@Test
		public void testSupportSwitchTo_preCreated() throws Exception {
		UserInfo userInfo = createUser(100, FLAG_FULL, null);
		userInfo.preCreated = true;
		assertFalse("Switching to a precreated user should be disabled",
		userInfo.supportsSwitchTo());

		userInfo.preCreated = false;
		assertTrue("Switching to a full, real user should be allowed", userInfo.supportsSwitchTo());
		}

		/** Test UserInfo.supportsSwitchTo() for profiles. */
		@Test
		public void testSupportSwitchTo_profile() throws Exception {
		UserInfo userInfo = createUser(100, FLAG_PROFILE, null);
		assertFalse("Switching to a profiles should be disabled", userInfo.supportsSwitchTo());
		}

		/** Tests upgradeIfNecessaryLP (but without locking) for upgrading from version 8 to 9+. */
		@Test
		public void testUpgradeIfNecessaryLP_9() {