am 7b3add61: am f368f6b9: am 6ee8a509: am c55c4a28: am b14dc048: Merge "Add... (ee944843) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -9462,13 +9462,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;

api/system-current.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -9797,13 +9797,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;

core/java/android/content/pm/PermissionInfo.java

+22 −7

Original line number	Diff line number	Diff line
		@@ -48,17 +48,25 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
		public static final int PROTECTION_SIGNATURE = 2;

		/**
		* System-level value for {@link #protectionLevel}, corresponding
		* to the <code>signatureOrSystem</code> value of
		* {@link android.R.attr#protectionLevel}.
		* @deprecated Use {@link #PROTECTION_SIGNATURE}\|{@link #PROTECTION_FLAG_PRIVILEGED}
		* instead.
		*/
		@Deprecated
		public static final int PROTECTION_SIGNATURE_OR_SYSTEM = 3;

		/**
		* Additional flag for {@link #protectionLevel}, corresponding
		* to the <code>system</code> value of
		* to the <code>privileged</code> value of
		* {@link android.R.attr#protectionLevel}.
		*/
		public static final int PROTECTION_FLAG_PRIVILEGED = 0x10;

		/**
		* @deprecated Old name for {@link #PROTECTION_FLAG_PRIVILEGED}, which
		* is now very confusing because it only applies to privileged apps, not all
		* apps on the system image.
		*/
		@Deprecated
		public static final int PROTECTION_FLAG_SYSTEM = 0x10;

		/**
		@@ -96,6 +104,13 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
		*/
		public static final int PROTECTION_FLAG_VERIFIER = 0x200;

		/**
		* Additional flag for {@link #protectionLevel}, corresponding
		* to the <code>preinstalled</code> value of
		* {@link android.R.attr#protectionLevel}.
		*/
		public static final int PROTECTION_FLAG_PREINSTALLED = 0x400;

		/**
		* Mask for {@link #protectionLevel}: the basic protection type.
		*/
		@@ -161,7 +176,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
		/** @hide */
		public static int fixProtectionLevel(int level) {
		if (level == PROTECTION_SIGNATURE_OR_SYSTEM) {
		level = PROTECTION_SIGNATURE \| PROTECTION_FLAG_SYSTEM;
		level = PROTECTION_SIGNATURE \| PROTECTION_FLAG_PRIVILEGED;
		}
		return level;
		}
		@@ -183,8 +198,8 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
		protLevel = "signatureOrSystem";
		break;
		}
		if ((level&PermissionInfo.PROTECTION_FLAG_SYSTEM) != 0) {
		protLevel += "\|system";
		if ((level&PermissionInfo.PROTECTION_FLAG_PRIVILEGED) != 0) {
		protLevel += "\|privileged";
		}
		if ((level&PermissionInfo.PROTECTION_FLAG_DEVELOPMENT) != 0) {
		protLevel += "\|development";

core/res/AndroidManifest.xml

+120 −120

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/attrs_manifest.xml

+7 −1

Original line number	Diff line number	Diff line
		@@ -200,7 +200,7 @@
		together. -->
		<flag name="signatureOrSystem" value="3" />
		<!-- Additional flag from base permission type: this permission can also
		be granted to any applications installed on the system image.
		be granted to any applications installed as privileged apps on the system image.
		Please avoid using this option, as the
		signature protection level should be sufficient for most needs and
		works regardless of exactly where applications are installed. This
		@@ -208,6 +208,8 @@
		vendors have applications built in to a system image which need
		to share specific features explicitly because they are being built
		together. -->
		<flag name="privileged" value="0x10" />
		<!-- Old synonym for "privileged". -->
		<flag name="system" value="0x10" />
		<!-- Additional flag from base permission type: this permission can also
		(optionally) be granted to development applications. -->
		@@ -226,6 +228,10 @@
		<!-- Additional flag from base permission type: this permission can be automatically
		granted to system apps that verify packages. -->
		<flag name="verifier" value="0x200" />
		<!-- Additional flag from base permission type: this permission can be automatically
		granted any application pre-installed on the system image (not just privileged
		apps). -->
		<flag name="preinstalled" value="0x400" />
		</attr>

		<!-- Flags indicating more context for a permission group. -->