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

Merge "PackageManagerShellCommand: implicitly add --wait for staged installs" am: 042ec2c190 am: 2fa3a111d1

Browse Source 
Change-Id: I296dc864ae35b1de923f8d8e299717f1df2bf3ce
This commit is contained in:
Automerger Merge Worker
2020-01-21 23:38:36 +00:00
parent 5a10428642 2fa3a111d1
commit c7f104c424
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -1159,7 +1159,7 @@ class PackageManagerShellCommand extends ShellCommand {
}
abandonSession = false;
if (!params.sessionParams.isStaged || !params.waitForStagedSessionReady) {
if (!params.sessionParams.isStaged || !params.mWaitForStagedSessionReady) {
pw.println("Success");
return 0;
}
@@ -1197,7 +1197,7 @@ class PackageManagerShellCommand extends ShellCommand {
+ si.getStagedSessionErrorMessage() + "]");
return 1;
}
pw.println("Success");
pw.println("Success. Reboot device to apply staged session");
return 0;
} finally {
if (abandonSession) {
@@ -2494,7 +2494,7 @@ class PackageManagerShellCommand extends ShellCommand {
SessionParams sessionParams;
String installerPackageName;
int userId = UserHandle.USER_ALL;
boolean waitForStagedSessionReady = false;
boolean mWaitForStagedSessionReady = true;
long timeoutMs = DEFAULT_WAIT_MS;
}
@@ -2622,13 +2622,16 @@ class PackageManagerShellCommand extends ShellCommand {
sessionParams.installFlags |= PackageManager.INSTALL_ENABLE_ROLLBACK;
break;
case "--wait":
params.waitForStagedSessionReady = true;
params.mWaitForStagedSessionReady = true;
try {
params.timeoutMs = Long.parseLong(peekNextArg());
getNextArg();
} catch (NumberFormatException ignore) {
}
break;
case "--no-wait":
params.mWaitForStagedSessionReady = false;
break;
default:
throw new IllegalArgumentException("Unknown option " + opt);
}