From 80af6a27fd38c105ca16a110b158a5c6bf6835d3 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 2 Mar 2017 08:32:33 -0800 Subject: [PATCH] Adding platform constants for various install reasons. Bug: 33415829 Test: Not a testable change Change-Id: Ib0803e55f71a1c6b46e12b1a324db4e028a20529 --- api/current.txt | 5 ++++- api/system-current.txt | 5 ++++- api/test-current.txt | 5 ++++- .../android/content/pm/PackageManager.java | 21 ++++++++++++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index c7074cca6e0e1..49b1ce42e39dc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10476,8 +10476,11 @@ package android.content.pm { field public static final int GET_SIGNATURES = 64; // 0x40 field public static final deprecated int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000 field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800 + field public static final int INSTALL_REASON_DEVICE_RESTORE = 2; // 0x2 + field public static final int INSTALL_REASON_DEVICE_SETUP = 3; // 0x3 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_USER = 4; // 0x4 field public static final int MATCH_ALL = 131072; // 0x20000 field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000 field public static final int MATCH_DIRECT_BOOT_AWARE = 524288; // 0x80000 @@ -30125,12 +30128,12 @@ package android.os { field public static final int BATTERY_PLUGGED_AC = 1; // 0x1 field public static final int BATTERY_PLUGGED_USB = 2; // 0x2 field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4 - field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6 field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4 field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1 field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3 field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2 field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5 + field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6 field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2 field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3 field public static final int BATTERY_STATUS_FULL = 5; // 0x5 diff --git a/api/system-current.txt b/api/system-current.txt index a46735122ef53..ccf2303b23468 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11079,8 +11079,11 @@ package android.content.pm { field public static final int INSTALL_PARSE_FAILED_NOT_APK = -100; // 0xffffff9c field public static final int INSTALL_PARSE_FAILED_NO_CERTIFICATES = -103; // 0xffffff99 field public static final int INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION = -102; // 0xffffff9a + field public static final int INSTALL_REASON_DEVICE_RESTORE = 2; // 0x2 + field public static final int INSTALL_REASON_DEVICE_SETUP = 3; // 0x3 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_USER = 4; // 0x4 field public static final int INSTALL_SUCCEEDED = 1; // 0x1 field public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS = 2; // 0x2 field public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK = 4; // 0x4 @@ -32727,12 +32730,12 @@ package android.os { field public static final int BATTERY_PLUGGED_AC = 1; // 0x1 field public static final int BATTERY_PLUGGED_USB = 2; // 0x2 field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4 - field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6 field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4 field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1 field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3 field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2 field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5 + field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6 field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2 field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3 field public static final int BATTERY_STATUS_FULL = 5; // 0x5 diff --git a/api/test-current.txt b/api/test-current.txt index 1a12b4c088ebe..6a8d375d88a65 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -10511,8 +10511,11 @@ package android.content.pm { field public static final int GET_SIGNATURES = 64; // 0x40 field public static final deprecated int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000 field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800 + field public static final int INSTALL_REASON_DEVICE_RESTORE = 2; // 0x2 + field public static final int INSTALL_REASON_DEVICE_SETUP = 3; // 0x3 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_USER = 4; // 0x4 field public static final int MATCH_ALL = 131072; // 0x20000 field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000 field public static final int MATCH_DIRECT_BOOT_AWARE = 524288; // 0x80000 @@ -30221,12 +30224,12 @@ package android.os { field public static final int BATTERY_PLUGGED_AC = 1; // 0x1 field public static final int BATTERY_PLUGGED_USB = 2; // 0x2 field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4 - field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6 field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4 field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1 field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3 field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2 field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5 + field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6 field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2 field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3 field public static final int BATTERY_STATUS_FULL = 5; // 0x5 diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 0482f5136b0cb..62b98e3917eb4 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -745,7 +745,8 @@ public abstract class PackageManager { public static final int DONT_KILL_APP = 0x00000001; /** @hide */ - @IntDef({INSTALL_REASON_UNKNOWN, INSTALL_REASON_POLICY}) + @IntDef({INSTALL_REASON_UNKNOWN, INSTALL_REASON_POLICY, INSTALL_REASON_DEVICE_RESTORE, + INSTALL_REASON_DEVICE_SETUP, INSTALL_REASON_USER}) @Retention(RetentionPolicy.SOURCE) public @interface InstallReason {} @@ -759,6 +760,21 @@ public abstract class PackageManager { */ public static final int INSTALL_REASON_POLICY = 1; + /** + * Code indicating that this package was installed as part of restoring from another device. + */ + public static final int INSTALL_REASON_DEVICE_RESTORE = 2; + + /** + * Code indicating that this package was installed as part of device setup. + */ + public static final int INSTALL_REASON_DEVICE_SETUP = 3; + + /** + * Code indicating that the package installation was initiated by the user. + */ + public static final int INSTALL_REASON_USER = 4; + /** * Installation return code: this is passed to the * {@link IPackageInstallObserver} on success. @@ -6108,6 +6124,9 @@ public abstract class PackageManager { * * @see #INSTALL_REASON_UNKNOWN * @see #INSTALL_REASON_POLICY + * @see #INSTALL_REASON_DEVICE_RESTORE + * @see #INSTALL_REASON_DEVICE_SETUP + * @see #INSTALL_REASON_USER * * @hide */