diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-29 17:36:42 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-29 17:36:42 +0000 |
| commit | 4056014c47765249a9bd9f328b2ee905edba8596 (patch) | |
| tree | b48157e6ee3c04da681626c103440bd277602867 | |
| parent | e28a37b9247d70b06b6da338d6025aa574acee65 (diff) | |
| parent | 75e3e041fb63ea000c555505c4066e68f29112fb (diff) | |
| download | base-pie-qpr1-s3-release.tar.gz | |
Merge cherrypicks of [5383444, 5383343] into pi-qpr1-releaseandroid-9.0.0_r22android-9.0.0_r21pie-qpr1-s3-release
Change-Id: Id19a54e066b157c379506cef3b6725d66a059c79
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | telephony/java/android/provider/Telephony.java | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index cda1293e93c7..8cadd8c332cf 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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" /> diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java index f2438b833d90..d6814f918f58 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -1151,6 +1151,33 @@ public final class Telephony { "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. * |