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

Commit bf459562 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose an API to mark a session as APEX."

parents 5fa8cb38 3fa46d86

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -11441,6 +11441,7 @@ package android.content.pm { 
    method public void setAppIcon(@Nullable android.graphics.Bitmap);

    method public void setAppIcon(@Nullable android.graphics.Bitmap);

    method public void setAppLabel(@Nullable CharSequence);

    method public void setAppLabel(@Nullable CharSequence);

    method public void setAppPackageName(@Nullable String);

    method public void setAppPackageName(@Nullable String);

    method public void setInstallAsApex();

    method public void setInstallLocation(int);

    method public void setInstallLocation(int);

    method public void setInstallReason(int);

    method public void setInstallReason(int);

    method public void setMultiPackage();

    method public void setMultiPackage();

core/java/android/content/pm/PackageInstaller.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -1543,6 +1543,13 @@ public class PackageInstaller { 
            this.isStaged = true;

            this.isStaged = true;

        }

        }





        /**

         * Set this session to be installing an APEX package.

         */

        public void setInstallAsApex() {

            installFlags |= PackageManager.INSTALL_APEX;

        }



        /** {@hide} */

        /** {@hide} */

        public void dump(IndentingPrintWriter pw) {

        public void dump(IndentingPrintWriter pw) {

            pw.printPair("mode", mode);

            pw.printPair("mode", mode);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2307,7 +2307,7 @@ class PackageManagerShellCommand extends ShellCommand { 
                    sessionParams.installFlags |= PackageManager.INSTALL_FORCE_SDK;

                    sessionParams.installFlags |= PackageManager.INSTALL_FORCE_SDK;

                    break;

                    break;

                case "--apex":

                case "--apex":

                    sessionParams.installFlags |= PackageManager.INSTALL_APEX;

                    sessionParams.setInstallAsApex();

                    sessionParams.setStaged();

                    sessionParams.setStaged();

                    break;

                    break;

                case "--multi-package":

                case "--multi-package":