Merge "PackageManagerShellCommand: implicitly add --wait for staged installs"... (c7f104c4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}