Merge "Merge "Document the behavior of the --force-non-staged flag." am:... (f979f01b) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -4269,7 +4269,7 @@ class PackageManagerShellCommand extends ShellCommand {
		pw.println(" [--preload] [--instant] [--full] [--dont-kill]");
		pw.println(" [--enable-rollback]");
		pw.println(" [--force-uuid internal\|UUID] [--pkg PACKAGE] [-S BYTES]");
		pw.println(" [--apex] [--staged-ready-timeout TIMEOUT]");
		pw.println(" [--apex] [--force-non-staged] [--staged-ready-timeout TIMEOUT]");
		pw.println(" [PATH [SPLIT...]\|-]");
		pw.println(" Install an application. Must provide the apk data to install, either as");
		pw.println(" file path(s) or '-' to read from stdin. Options are:");
		@@ -4298,6 +4298,8 @@ class PackageManagerShellCommand extends ShellCommand {
		pw.println(" --update-ownership: request the update ownership enforcement");
		pw.println(" --force-uuid: force install on to disk volume with given UUID");
		pw.println(" --apex: install an .apex file, not an .apk");
		pw.println(" --force-non-staged: force the installation to run under a non-staged");
		pw.println(" session, which may complete without requiring a reboot");
		pw.println(" --staged-ready-timeout: By default, staged sessions wait "
		+ DEFAULT_STAGED_READY_TIMEOUT_MS);
		pw.println(" milliseconds for pre-reboot verification to complete when");