Merge "Fix FLAG_PRIVILEGED numbering" (dee987c9) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ApplicationInfo.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -314,6 +314,14 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		*/
		public static final int FLAG_IS_DATA_ONLY = 1<<24;

		/**
		* Value for {@link #flags}: set to {@code true} if the application
		* is permitted to hold privileged permissions.
		*
		* {@hide}
		*/
		public static final int FLAG_PRIVILEGED = 1<<30;

		/**
		* Value for {@link #flags}: Set to true if the application has been
		* installed using the forward lock option.
		@@ -337,14 +345,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		*/
		public static final int FLAG_CANT_SAVE_STATE = 1<<28;

		/**
		* Value for {@link #flags}: set to {@code true} if the application
		* is permitted to hold privileged permissions.
		*
		* {@hide}
		*/
		public static final int FLAG_PRIVILEGED = 1<<29;

		/**
		* Flags associated with the application. Any combination of
		* {@link #FLAG_SYSTEM}, {@link #FLAG_DEBUGGABLE}, {@link #FLAG_HAS_CODE},