Merge "Add wait flag to am switch-user command." (223ccc0d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+42 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.app.IStopUserCallback;
		import android.app.IUidObserver;
		import android.app.KeyguardManager;
		import android.app.ProfilerInfo;
		import android.app.UserSwitchObserver;
		import android.app.WaitResult;
		import android.app.usage.AppStandbyInfo;
		import android.app.usage.ConfigurationStats;
		@@ -1729,6 +1730,30 @@ final class ActivityManagerShellCommand extends ShellCommand {
		return 0;
		}

		private void switchUserAndWaitForComplete(int userId) throws RemoteException {
		// Register switch observer.
		final CountDownLatch switchLatch = new CountDownLatch(1);
		mInterface.registerUserSwitchObserver(
		new UserSwitchObserver() {
		@Override
		public void onUserSwitchComplete(int newUserId) {
		if (userId == newUserId) {
		switchLatch.countDown();
		}
		}
		}, ActivityManagerShellCommand.class.getName());

		// Switch.
		mInterface.switchUser(userId);

		// Wait.
		try {
		switchLatch.await(USER_OPERATION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
		} catch (InterruptedException e) {
		getErrPrintWriter().println("Thread interrupted unexpectedly.");
		}
		}

		int runSwitchUser(PrintWriter pw) throws RemoteException {
		UserManager userManager = mInternal.mContext.getSystemService(UserManager.class);
		final int userSwitchable = userManager.getUserSwitchability();
		@@ -1736,8 +1761,23 @@ final class ActivityManagerShellCommand extends ShellCommand {
		getErrPrintWriter().println("Error: " + userSwitchable);
		return -1;
		}
		String user = getNextArgRequired();
		mInterface.switchUser(Integer.parseInt(user));
		boolean wait = false;
		String opt;
		while ((opt = getNextOption()) != null) {
		if ("-w".equals(opt)) {
		wait = true;
		} else {
		getErrPrintWriter().println("Error: unknown option: " + opt);
		return -1;
		}
		}

		int userId = Integer.parseInt(getNextArgRequired());
		if (wait) {
		switchUserAndWaitForComplete(userId);
		} else {
		mInterface.switchUser(userId);
		}
		return 0;
		}