Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99bfe4ba authored by Mateus Azis's avatar Mateus Azis Committed by Automerger Merge Worker
Browse files

Merge "Document the behavior of the --force-non-staged flag." am: 232000e8 am: 4f23d7c1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2620101



Change-Id: I602bb4d69c30cbb1241d57875a0cbb1c1527b95e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f386b1c3 4f23d7c1

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

+3 −1
Original line number Diff line number Diff line
@@ -3978,7 +3978,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:");
@@ -4006,6 +4006,8 @@ class PackageManagerShellCommand extends ShellCommand { 
        pw.println("          3=device setup, 4=user request");

        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");