Add new "preinstalled" permission flag. (a90c8def) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −2

api/system-current.txt

+4 −2

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

+22 −7

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

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

	/**		/**
	* Additional flag for {@link #protectionLevel}, corresponding		* 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}.		* {@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;		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;		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.		* Mask for {@link #protectionLevel}: the basic protection type.
	*/		*/
	@@ -161,7 +176,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
	/** @hide */		/** @hide */
	public static int fixProtectionLevel(int level) {		public static int fixProtectionLevel(int level) {
	if (level == PROTECTION_SIGNATURE_OR_SYSTEM) {		if (level == PROTECTION_SIGNATURE_OR_SYSTEM) {
	level = PROTECTION_SIGNATURE \| PROTECTION_FLAG_SYSTEM;		level = PROTECTION_SIGNATURE \| PROTECTION_FLAG_PRIVILEGED;
	}		}
	return level;		return level;
	}		}
	@@ -183,8 +198,8 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
	protLevel = "signatureOrSystem";		protLevel = "signatureOrSystem";
	break;		break;
	}		}
	if ((level&PermissionInfo.PROTECTION_FLAG_SYSTEM) != 0) {		if ((level&PermissionInfo.PROTECTION_FLAG_PRIVILEGED) != 0) {
	protLevel += "\|system";		protLevel += "\|privileged";
	}		}
	if ((level&PermissionInfo.PROTECTION_FLAG_DEVELOPMENT) != 0) {		if ((level&PermissionInfo.PROTECTION_FLAG_DEVELOPMENT) != 0) {
	protLevel += "\|development";		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	Original line	Diff line number	Diff line
	@@ -200,7 +200,7 @@
	together. -->		together. -->
	<flag name="signatureOrSystem" value="3" />		<flag name="signatureOrSystem" value="3" />
	<!-- Additional flag from base permission type: this permission can also		<!-- 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		Please avoid using this option, as the
	signature protection level should be sufficient for most needs and		signature protection level should be sufficient for most needs and
	works regardless of exactly where applications are installed. This		works regardless of exactly where applications are installed. This
	@@ -208,6 +208,8 @@
	vendors have applications built in to a system image which need		vendors have applications built in to a system image which need
	to share specific features explicitly because they are being built		to share specific features explicitly because they are being built
	together. -->		together. -->
			<flag name="privileged" value="0x10" />
			<!-- Old synonym for "privileged". -->
	<flag name="system" value="0x10" />		<flag name="system" value="0x10" />
	<!-- Additional flag from base permission type: this permission can also		<!-- Additional flag from base permission type: this permission can also
	(optionally) be granted to development applications. -->		(optionally) be granted to development applications. -->
	@@ -226,6 +228,10 @@
	<!-- Additional flag from base permission type: this permission can be automatically		<!-- Additional flag from base permission type: this permission can be automatically
	granted to system apps that verify packages. -->		granted to system apps that verify packages. -->
	<flag name="verifier" value="0x200" />		<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>		</attr>

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