Merge "Adding a null check for ActivityManager#switchUser(UserHandle)." (c51b2c60) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -3705,11 +3705,16 @@ public class ActivityManager {
		* Returns whether switching to provided user was successful.
		*
		* @param user the user to switch to.
		*
		* @throws IllegalArgumentException if the user is null.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MANAGE_USERS)
		public boolean switchUser(UserHandle user) {
		public boolean switchUser(@NonNull UserHandle user) {
		if (user == null) {
		throw new IllegalArgumentException("UserHandle cannot be null.");
		}
		return switchUser(user.getIdentifier());
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -544,6 +544,18 @@ public class UserManagerTest extends AndroidTestCase {
		switchUser(-1, UserHandle.of(startUser), false);
		}

		public void testSwitchUserByHandle_ThrowsException() {
		synchronized (mUserSwitchLock) {
		try {
		ActivityManager am = getContext().getSystemService(ActivityManager.class);
		am.switchUser(null);
		fail("Expected IllegalArgumentException on passing in a null UserHandle.");
		} catch (IllegalArgumentException expected) {
		// Do nothing - exception is expected.
		}
		}
		}

		@MediumTest
		public void testConcurrentUserCreate() throws Exception {
		int userCount = mUserManager.getUserCount();