diff options
| author | 2016-02-04 18:08:30 -0800 | |
|---|---|---|
| committer | 2016-02-08 22:20:03 +0000 | |
| commit | c08268e647f89f8ddfd9c6fb1f6ac4f99b13b9cf (patch) | |
| tree | a464853444ea7a61abac1102f8ee647338d169d3 | |
| parent | 6af1d75a0c1cf814404e5142c3a7932ff9deade9 (diff) | |
Make permission RECEIVE_EMERGENCY_BROADCAST public.
It is required to receive intent SMS_EMERGENCY_CB_RECEIVED_ACTION
which is already public.
Bug: 24914029
Change-Id: I2d5461fcedb2cb347c818ab6f94577008f6af242
(cherry picked from commit 45d9b36fc6a609893022b812084987cda3e3717d)
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index ae343cdc5e8b..eb8befa286c5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -104,6 +104,7 @@ package android { field public static final java.lang.String READ_WRITE_CONTACT_METADATA = "android.permission.READ_WRITE_CONTACT_METADATA"; field public static final java.lang.String REBOOT = "android.permission.REBOOT"; field public static final java.lang.String RECEIVE_BOOT_COMPLETED = "android.permission.RECEIVE_BOOT_COMPLETED"; + field public static final java.lang.String RECEIVE_EMERGENCY_BROADCAST = "android.permission.RECEIVE_EMERGENCY_BROADCAST"; field public static final java.lang.String RECEIVE_MMS = "android.permission.RECEIVE_MMS"; field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS"; field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH"; diff --git a/api/test-current.txt b/api/test-current.txt index c1cd2750424e..e7f4336c0971 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -104,6 +104,7 @@ package android { field public static final java.lang.String READ_WRITE_CONTACT_METADATA = "android.permission.READ_WRITE_CONTACT_METADATA"; field public static final java.lang.String REBOOT = "android.permission.REBOOT"; field public static final java.lang.String RECEIVE_BOOT_COMPLETED = "android.permission.RECEIVE_BOOT_COMPLETED"; + field public static final java.lang.String RECEIVE_EMERGENCY_BROADCAST = "android.permission.RECEIVE_EMERGENCY_BROADCAST"; field public static final java.lang.String RECEIVE_MMS = "android.permission.RECEIVE_MMS"; field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS"; field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4cddb6c1bac4..bcef2b72d264 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -968,8 +968,7 @@ <!-- @SystemApi Allows an application to receive emergency cell broadcast messages, to record or display them to the user. - <p>Not for use by third-party applications. - @hide Pending API council approval --> + <p>Not for use by third-party applications. --> <permission android:name="android.permission.RECEIVE_EMERGENCY_BROADCAST" android:protectionLevel="signature|privileged" /> |