Merge cherrypicks of [5383444, 5383343] into pi-qpr1-release (4056014c) · Commits · e / os / android_frameworks_base

core/res/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -399,6 +399,7 @@

		<protected-broadcast android:name="android.telecom.action.DEFAULT_DIALER_CHANGED" />
		<protected-broadcast android:name="android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED" />
		<protected-broadcast android:name="android.provider.action.SMS_MMS_DB_CREATED" />
		<protected-broadcast android:name="android.intent.action.CONTENT_CHANGED" />
		<protected-broadcast android:name="android.provider.Telephony.MMS_DOWNLOADED" />

+27 −0

Original line number	Diff line number	Diff line
		@@ -1150,6 +1150,33 @@ public final class Telephony {
		public static final String ACTION_EXTERNAL_PROVIDER_CHANGE =
		"android.provider.action.EXTERNAL_PROVIDER_CHANGE";

		/**
		* Broadcast action: When SMS-MMS db is being created. If file-based encryption is
		* supported, this broadcast indicates creation of the db in credential-encrypted
		* storage. A boolean is specified in {@link #EXTRA_IS_INITIAL_CREATE} to indicate if
		* this is the initial create of the db. Requires
		* {@link android.Manifest.permission#READ_SMS} to receive.
		*
		* @see #EXTRA_IS_INITIAL_CREATE
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_SMS_MMS_DB_CREATED =
		"android.provider.action.SMS_MMS_DB_CREATED";

		/**
		* Boolean flag passed as an extra with {@link #ACTION_SMS_MMS_DB_CREATED} to indicate
		* whether the DB creation is the initial creation on the device, that is it is after a
		* factory-data reset or a new device. Any subsequent creations of the DB (which
		* happens only in error scenarios) will have this flag set to false.
		*
		* @see #ACTION_SMS_MMS_DB_CREATED
		*
		* @hide
		*/
		public static final String EXTRA_IS_INITIAL_CREATE =
		"android.provider.extra.IS_INITIAL_CREATE";
		/**
		* Read the PDUs out of an {@link #SMS_RECEIVED_ACTION} or a
		* {@link #DATA_SMS_RECEIVED_ACTION} intent.