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

Commit f4a6722e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Expose a setter for install scenarios" am: 29ec0b24 am: 34312d21... 

Merge "Expose a setter for install scenarios" am: 29ec0b24 am: 34312d21 am: 04422eca am: eb036726

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7d6afc073eebb5aae822b8b154683beae62e22a
parents 9153a9a7 eb036726

core/api/current.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -12208,6 +12208,7 @@ package android.content.pm { 
    method public void setAutoRevokePermissionsMode(boolean);

    method public void setAutoRevokePermissionsMode(boolean);

    method public void setInstallLocation(int);

    method public void setInstallLocation(int);

    method public void setInstallReason(int);

    method public void setInstallReason(int);

    method public void setInstallScenario(int);

    method public void setMultiPackage();

    method public void setMultiPackage();

    method public void setOriginatingUid(int);

    method public void setOriginatingUid(int);

    method public void setOriginatingUri(@Nullable android.net.Uri);

    method public void setOriginatingUri(@Nullable android.net.Uri);
@@ -12536,6 +12537,10 @@ package android.content.pm { 
    field public static final int INSTALL_REASON_POLICY = 1; // 0x1

    field public static final int INSTALL_REASON_POLICY = 1; // 0x1

    field public static final int INSTALL_REASON_UNKNOWN = 0; // 0x0

    field public static final int INSTALL_REASON_UNKNOWN = 0; // 0x0

    field public static final int INSTALL_REASON_USER = 4; // 0x4

    field public static final int INSTALL_REASON_USER = 4; // 0x4

    field public static final int INSTALL_SCENARIO_BULK = 2; // 0x2

    field public static final int INSTALL_SCENARIO_BULK_SECONDARY = 3; // 0x3

    field public static final int INSTALL_SCENARIO_DEFAULT = 0; // 0x0

    field public static final int INSTALL_SCENARIO_FAST = 1; // 0x1

    field public static final int MATCH_ALL = 131072; // 0x20000

    field public static final int MATCH_ALL = 131072; // 0x20000

    field public static final int MATCH_APEX = 1073741824; // 0x40000000

    field public static final int MATCH_APEX = 1073741824; // 0x40000000

    field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000

    field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000

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

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

            this.forceQueryableOverride = true;

        }

        }





        /**

         * Sets the install scenario for this session, which describes the expected user journey.

         */

        public void setInstallScenario(@InstallScenario int installScenario) {

            this.installScenario = installScenario;

        }



        /** {@hide} */

        /** {@hide} */

        public void dump(IndentingPrintWriter pw) {

        public void dump(IndentingPrintWriter pw) {

            pw.printPair("mode", mode);

            pw.printPair("mode", mode);

core/java/android/content/pm/PackageManager.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -1356,15 +1356,11 @@ public abstract class PackageManager { 




    /**

    /**

     * A value to indicate the lack of CUJ information, disabling all installation scenario logic.

     * A value to indicate the lack of CUJ information, disabling all installation scenario logic.

     *

     * @hide

     */

     */

    public static final int INSTALL_SCENARIO_DEFAULT = 0;

    public static final int INSTALL_SCENARIO_DEFAULT = 0;





    /**

    /**

     * Installation scenario providing the fastest “install button to launch" experience possible.

     * Installation scenario providing the fastest “install button to launch" experience possible.

     *

     * @hide

     */

     */

    public static final int INSTALL_SCENARIO_FAST = 1;

    public static final int INSTALL_SCENARIO_FAST = 1;
@@ -1381,8 +1377,6 @@ public abstract class PackageManager { 
     * less optimized applications.  The device state (e.g. memory usage or battery status) should

     * less optimized applications.  The device state (e.g. memory usage or battery status) should

     * not be considered when making this decision as those factors are taken into account by the

     * not be considered when making this decision as those factors are taken into account by the

     * Package Manager when acting on the installation scenario.

     * Package Manager when acting on the installation scenario.

     *

     * @hide

     */

     */

    public static final int INSTALL_SCENARIO_BULK = 2;

    public static final int INSTALL_SCENARIO_BULK = 2;
@@ -1393,8 +1387,6 @@ public abstract class PackageManager { 
     * operation that are marked BULK_SECONDARY, the faster the entire bulk operation will be.

     * operation that are marked BULK_SECONDARY, the faster the entire bulk operation will be.

     *

     *

     * See the comments for INSTALL_SCENARIO_BULK for more information.

     * See the comments for INSTALL_SCENARIO_BULK for more information.

     *

     * @hide

     */

     */

    public static final int INSTALL_SCENARIO_BULK_SECONDARY = 3;

    public static final int INSTALL_SCENARIO_BULK_SECONDARY = 3;