Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose a setter for install scenarios" am: 29ec0b24c7 am: 34312d2173

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72aaba3a7214c8cb3a2d25293f175ce27e0da50e
This commit is contained in:
Treehugger Robot
2021-02-17 18:53:43 +00:00
committed by Automerger Merge Worker
parent 0fd3dfe01b 34312d2173
commit 04422ecae9
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/current.txt
View File

@@ -11922,6 +11922,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);
@@ -12236,6 +12237,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

7
core/java/android/content/pm/PackageInstaller.java
View File

@@ -1990,6 +1990,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);

8
core/java/android/content/pm/PackageManager.java
View File

@@ -1064,15 +1064,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;
@@ -1089,8 +1085,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;
@@ -1101,8 +1095,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;