summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-07-07 17:25:25 -0700
committerDianne Hackborn <hackbod@google.com>2015-07-07 17:25:25 -0700
commita90c8def2c6762bc6e5396b78c43e65e4b05079d (patch)
treeea3272f28ed7308ec41540d399e454261e51c56c /api
parentf2474d336a7df696f3897e2cd255d138eb3fac02 (diff)
downloadframeworks_base-a90c8def2c6762bc6e5396b78c43e65e4b05079d.zip
frameworks_base-a90c8def2c6762bc6e5396b78c43e65e4b05079d.tar.gz
frameworks_base-a90c8def2c6762bc6e5396b78c43e65e4b05079d.tar.bz2
Add new "preinstalled" permission flag.
This allows you to specify that a permission can be granted to any pre-installed system app (not just privileged ones). And as long as I am doing this, clean up the old "system" permission flag, renaming it to "privileged" which is what it really is today, deprecating the old names. And switch the platform's permission declarations to use the new name. Change-Id: Iabf484746af232144786851ec7fe90e3de9dddb2
Diffstat (limited to 'api')
-rw-r--r--api/current.txt6
-rw-r--r--api/system-current.txt6
2 files changed, 8 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index 2e2cae6..399c1df 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9443,13 +9443,15 @@ package android.content.pm {
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_PREINSTALLED = 1024; // 0x400
+ field public static final int PROTECTION_FLAG_PRIVILEGED = 16; // 0x10
+ field public static final deprecated 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 = 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
+ field public static final deprecated int PROTECTION_SIGNATURE_OR_SYSTEM = 3; // 0x3
field public int descriptionRes;
field public int flags;
field public java.lang.String group;
diff --git a/api/system-current.txt b/api/system-current.txt
index e84ad3d..e64567c 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9778,13 +9778,15 @@ package android.content.pm {
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_PREINSTALLED = 1024; // 0x400
+ field public static final int PROTECTION_FLAG_PRIVILEGED = 16; // 0x10
+ field public static final deprecated 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 = 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
+ field public static final deprecated int PROTECTION_SIGNATURE_OR_SYSTEM = 3; // 0x3
field public int descriptionRes;
field public int flags;
field public java.lang.String group;