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

Commit 1c825ba8 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Add --non-staged flag am: f85f3a29 

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



Change-Id: Ie2a69a3ce362a09d97a6d06034083eccc5234ac9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6fbd2717 f85f3a29

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

+21 −4
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ import android.os.ServiceManager; 
import android.os.ServiceSpecificException;

import android.os.ShellCommand;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;
@@ -3053,6 +3052,13 @@ class PackageManagerShellCommand extends ShellCommand { 
        // Set package source to other by default

        sessionParams.setPackageSource(PackageInstaller.PACKAGE_SOURCE_OTHER);



        // Encodes one of the states:

        //  1. Install request explicitly specified --staged, then value will be true.

        //  2. Install request explicitly specified --non-staged, then value will be false.

        //  3. Install request did not specify either --staged or --non-staged, then for APEX

        //      installs the value will be true, and for apk installs it will be false.

        Boolean staged = null;



        String opt;

        boolean replaceExisting = true;

        boolean forceNonStaged = false;
@@ -3151,7 +3157,6 @@ class PackageManagerShellCommand extends ShellCommand { 
                    break;

                case "--apex":

                    sessionParams.setInstallAsApex();

                    sessionParams.setStaged();

                    break;

                case "--force-non-staged":

                    forceNonStaged = true;
@@ -3160,7 +3165,10 @@ class PackageManagerShellCommand extends ShellCommand { 
                    sessionParams.setMultiPackage();

                    break;

                case "--staged":

                    sessionParams.setStaged();

                    staged = true;

                    break;

                case "--non-staged":

                    staged = false;

                    break;

                case "--force-queryable":

                    sessionParams.setForceQueryable();
@@ -3192,11 +3200,16 @@ class PackageManagerShellCommand extends ShellCommand { 
                    throw new IllegalArgumentException("Unknown option " + opt);

            }

        }

        if (staged == null) {

            staged = (sessionParams.installFlags & PackageManager.INSTALL_APEX) != 0;

        }

        if (replaceExisting) {

            sessionParams.installFlags |= PackageManager.INSTALL_REPLACE_EXISTING;

        }

        if (forceNonStaged) {

            sessionParams.isStaged = false;

        } else if (staged) {

            sessionParams.setStaged();

        }

        return params;

    }
@@ -3978,7 +3991,8 @@ 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] [--force-non-staged] [--staged-ready-timeout TIMEOUT]");

        pw.println("       [--apex] [--non-staged] [--force-non-staged]");

        pw.println("       [--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 +4020,9 @@ 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("      --non-staged: explicitly set this installation to be non-staged.");

        pw.println("          This flag is only useful for APEX installs that are implicitly");

        pw.println("          assumed to be staged.");

        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 "