diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-07-07 23:44:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 23:44:34 +0000 |
| commit | 3e07ee078de8e364d6be0b18b2b514e40decdb3c (patch) | |
| tree | 1984905d557837c28c3aa97aeea9a65c32d2963c /api | |
| parent | 15369c6c3ba50a852ed0c499eb5929436cffa005 (diff) | |
| parent | 3e7d977ff7c743713f0ad6336a039d7760ba47d1 (diff) | |
| download | frameworks_base-3e07ee078de8e364d6be0b18b2b514e40decdb3c.zip frameworks_base-3e07ee078de8e364d6be0b18b2b514e40decdb3c.tar.gz frameworks_base-3e07ee078de8e364d6be0b18b2b514e40decdb3c.tar.bz2 | |
Merge "Grant installer and verifier install permissions robustly" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index c6b2c28..fa77000 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9439,10 +9439,12 @@ package android.content.pm { field public static final int PROTECTION_DANGEROUS = 1; // 0x1 field public static final int PROTECTION_FLAG_APPOP = 64; // 0x40 field public static final int PROTECTION_FLAG_DEVELOPMENT = 32; // 0x20 + field public static final int PROTECTION_FLAG_INSTALLER = 256; // 0x100 field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80 field public static final int PROTECTION_FLAG_SYSTEM = 16; // 0x10 + field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200 field public static final int PROTECTION_MASK_BASE = 15; // 0xf - field public static final int PROTECTION_MASK_FLAGS = 240; // 0xf0 + field public static final int PROTECTION_MASK_FLAGS = 4080; // 0xff0 field public static final int PROTECTION_NORMAL = 0; // 0x0 field public static final int PROTECTION_SIGNATURE = 2; // 0x2 field public static final int PROTECTION_SIGNATURE_OR_SYSTEM = 3; // 0x3 diff --git a/api/system-current.txt b/api/system-current.txt index 4e76475..dbe4b8f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9774,10 +9774,12 @@ package android.content.pm { field public static final int PROTECTION_DANGEROUS = 1; // 0x1 field public static final int PROTECTION_FLAG_APPOP = 64; // 0x40 field public static final int PROTECTION_FLAG_DEVELOPMENT = 32; // 0x20 + field public static final int PROTECTION_FLAG_INSTALLER = 256; // 0x100 field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80 field public static final int PROTECTION_FLAG_SYSTEM = 16; // 0x10 + field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200 field public static final int PROTECTION_MASK_BASE = 15; // 0xf - field public static final int PROTECTION_MASK_FLAGS = 240; // 0xf0 + field public static final int PROTECTION_MASK_FLAGS = 4080; // 0xff0 field public static final int PROTECTION_NORMAL = 0; // 0x0 field public static final int PROTECTION_SIGNATURE = 2; // 0x2 field public static final int PROTECTION_SIGNATURE_OR_SYSTEM = 3; // 0x3 |