resolved conflicts for merge of 5a8f877c to kraken (34483a0f) · Commits · e / os / android_frameworks_base

api/8.xml

+56 −1

Original line number	Diff line number	Diff line
		@@ -27144,7 +27144,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="fd" type="android.os.ParcelFileDescriptor">
		<parameter name="newState" type="android.os.ParcelFileDescriptor">
		</parameter>
		</method>
		</interface>
		@@ -37923,6 +37923,28 @@
		visibility="public"
		>
		</field>
		<field name="ACTION_EXTERNAL_APPLICATIONS_AVAILABLE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_FACTORY_TEST"
		type="java.lang.String"
		transient="false"
		@@ -38890,6 +38912,28 @@
		visibility="public"
		>
		</field>
		<field name="EXTRA_CHANGED_PACKAGE_LIST"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.extra.changed_package_list""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_CHANGED_UID_LIST"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.extra.changed_uid_list""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_DATA_REMOVED"
		type="java.lang.String"
		transient="false"
		@@ -42658,6 +42702,17 @@
		visibility="public"
		>
		</field>
		<field name="FLAG_EXTERNAL_STORAGE"
		type="int"
		transient="false"
		volatile="false"
		value="524288"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_FACTORY_TEST"
		type="int"
		transient="false"

api/current.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -46178,6 +46178,17 @@
		visibility="public"
		>
		</field>
		<field name="FLAG_EXTERNAL_STORAGE"
		type="int"
		transient="false"
		volatile="false"
		value="524288"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_FACTORY_TEST"
		type="int"
		transient="false"

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -265,17 +265,22 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		* Value for {@link #flags}: Set to true if the application has been
		* installed using the forward lock option.
		*
		* {@hide}
		* Value for {@link #flags}: Set to true if the application is
		* currently installed on external/removable/unprotected storage. Such
		* applications may not be available if their storage is not currently
		* mounted. When the storage it is on is not available, it will look like
		* the application has been uninstalled (its .apk is no longer available)
		* but its persistent data is not removed.
		*/
		public static final int FLAG_FORWARD_LOCK = 1<<19;
		public static final int FLAG_EXTERNAL_STORAGE = 1<<19;

		/**
		* Value for {@link #flags}: Set to true if the application is
		* currently installed on the sdcard.
		* Value for {@link #flags}: Set to true if the application has been
		* installed using the forward lock option.
		*
		* {@hide}
		*/
		public static final int FLAG_EXTERNAL_STORAGE = 1<<20;
		public static final int FLAG_FORWARD_LOCK = 1<<20;

		/**
		* Value for {@link #flags}: Set to true if the application is