Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add wait flag to am switch-user command."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-18 12:54:27 +00:00
committed by Android (Google) Code Review
parent 77638134a4 e204361719
commit 223ccc0d09
1 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -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;
}