diff options
| author | 2017-03-28 20:46:41 +0000 | |
|---|---|---|
| committer | 2017-03-28 20:46:44 +0000 | |
| commit | 1b782bffdfb197de7ac2181395cd8f8500b0a512 (patch) | |
| tree | e4d7e989aa606ecc32793181db78cc0e048d8684 | |
| parent | 01d69aae3a8431055f2f6dabd0acfba8eaf30b3b (diff) | |
| parent | ea2529df19eb38425d86ae74c7ba01089492aa31 (diff) | |
Merge "make MATCH_FACTORY_ONLY @SystemAPI" into oc-dev
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 6e3caf4549c6..03b522d457dc 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11422,6 +11422,7 @@ package android.content.pm { field public static final int MATCH_DIRECT_BOOT_UNAWARE = 262144; // 0x40000 field public static final int MATCH_DISABLED_COMPONENTS = 512; // 0x200 field public static final int MATCH_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000 + field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000 field public static final int MATCH_INSTANT = 8388608; // 0x800000 field public static final int MATCH_SYSTEM_ONLY = 1048576; // 0x100000 field public static final int MATCH_UNINSTALLED_PACKAGES = 8192; // 0x2000 diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 4a36f36719e0..136c13b6f37d 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -432,6 +432,7 @@ public abstract class PackageManager { * This will not return information on any unbundled update to system components. * @hide */ + @SystemApi public static final int MATCH_FACTORY_ONLY = 0x00200000; /** |