Merge "Added a new API for SUW: ActivityManager#switchUser(UserHandle)." (47f43001) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -298,6 +298,7 @@ package android.app {
		method public void killUid(int, java.lang.String);
		method public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);
		method public static void setPersistentVrThread(int);
		method public boolean switchUser(android.os.UserHandle);
		}

		public static abstract interface ActivityManager.OnUidImportanceListener {

core/java/android/app/ActivityManager.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -3675,6 +3675,18 @@ public class ActivityManager {
		}
		}

		/**
		* Returns whether switching to provided user was successful.
		*
		* @param user the user to switch to.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MANAGE_USERS)
		public boolean switchUser(UserHandle user) {
		return switchUser(user.getIdentifier());
		}

		/**
		* Logs out current current foreground user by switching to the system user and stopping the
		* user being switched from.

services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java

+28 −5

Original line number	Diff line number	Diff line
		@@ -527,9 +527,21 @@ public class UserManagerTest extends AndroidTestCase {
		UserInfo user = createUser("User", 0);
		assertNotNull(user);
		// Switch to the user just created.
		switchUser(user.id);
		switchUser(user.id, null, true);
		// Switch back to the starting user.
		switchUser(startUser);
		switchUser(startUser, null, true);
		}

		@LargeTest
		public void testSwitchUserByHandle() {
		ActivityManager am = getContext().getSystemService(ActivityManager.class);
		final int startUser = am.getCurrentUser();
		UserInfo user = createUser("User", 0);
		assertNotNull(user);
		// Switch to the user just created.
		switchUser(-1, user.getUserHandle(), false);
		// Switch back to the starting user.
		switchUser(-1, UserHandle.of(startUser), false);
		}

		@MediumTest
		@@ -567,10 +579,20 @@ public class UserManagerTest extends AndroidTestCase {
		}
		}

		private void switchUser(int userId) {
		/**
		* @param userId value will be used to call switchUser(int) only if ignoreHandle is false.
		* @param user value will be used to call switchUser(UserHandle) only if ignoreHandle is true.
		* @param ignoreHandle if true, switchUser(int) will be called with the provided userId,
		* else, switchUser(UserHandle) will be called with the provided user.
		*/
		private void switchUser(int userId, UserHandle user, boolean ignoreHandle) {
		synchronized (mUserSwitchLock) {
		ActivityManager am = getContext().getSystemService(ActivityManager.class);
		if (ignoreHandle) {
		am.switchUser(userId);
		} else {
		am.switchUser(user);
		}
		long time = System.currentTimeMillis();
		try {
		mUserSwitchLock.wait(SWITCH_USER_TIMEOUT_MILLIS);
		@@ -579,7 +601,8 @@ public class UserManagerTest extends AndroidTestCase {
		return;
		}
		if (System.currentTimeMillis() - time > SWITCH_USER_TIMEOUT_MILLIS) {
		fail("Timeout waiting for the user switch to u" + userId);
		fail("Timeout waiting for the user switch to u"
		+ (ignoreHandle ? userId : user.getIdentifier()));
		}
		}
		}