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

Merge "ActivityManagerShellCommand calls getUserSwitchability with wrong user"

Browse Source
This commit is contained in:
Yasin Kilicdere
2022-12-08 18:58:04 +00:00
committed by Android (Google) Code Review
parent 0e2c87bf24 ec5aa8f126
commit e8e3742677
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2006,12 +2006,6 @@ final class ActivityManagerShellCommand extends ShellCommand {
}
int runSwitchUser(PrintWriter pw) throws RemoteException {
UserManager userManager = mInternal.mContext.getSystemService(UserManager.class);
final int userSwitchable = userManager.getUserSwitchability();
if (userSwitchable != UserManager.SWITCHABILITY_STATUS_OK) {
getErrPrintWriter().println("Error: " + userSwitchable);
return -1;
}
boolean wait = false;
String opt;
while ((opt = getNextOption()) != null) {
@@ -2024,6 +2018,14 @@ final class ActivityManagerShellCommand extends ShellCommand {
}
int userId = Integer.parseInt(getNextArgRequired());
UserManager userManager = mInternal.mContext.getSystemService(UserManager.class);
final int userSwitchable = userManager.getUserSwitchability(UserHandle.of(userId));
if (userSwitchable != UserManager.SWITCHABILITY_STATUS_OK) {
getErrPrintWriter().println("Error: UserSwitchabilityResult=" + userSwitchable);
return -1;
}
boolean switched;
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "shell_runSwitchUser");
try {