diff options
| author | 2015-08-17 20:08:19 +0000 | |
|---|---|---|
| committer | 2015-08-17 20:08:19 +0000 | |
| commit | de243eb290c194b2204a27c0276bae5cd024797d (patch) | |
| tree | 3e7ef7946906040b80d15892c2beee96ab882ec7 | |
| parent | e7194f9954866fafcaeb2089bee62f0e550d02d7 (diff) | |
| parent | 55d39ecb55052641db98566b5323c0af2b476990 (diff) | |
am 55d39ecb: am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
* commit '55d39ecb55052641db98566b5323c0af2b476990':
Introduce permission for updating the cell broadcast content provider.
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index fa08ebaefb1e..f464292a3cb9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -130,6 +130,7 @@ package android { field public static final java.lang.String MODIFY_APPWIDGET_BIND_PERMISSIONS = "android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"; field public static final java.lang.String MODIFY_AUDIO_ROUTING = "android.permission.MODIFY_AUDIO_ROUTING"; field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS"; + field public static final java.lang.String MODIFY_CELL_BROADCASTS = "android.permission.MODIFY_CELL_BROADCASTS"; field public static final java.lang.String MODIFY_NETWORK_ACCOUNTING = "android.permission.MODIFY_NETWORK_ACCOUNTING"; field public static final java.lang.String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS"; field public static final java.lang.String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 79ba35580999..ec98aba3f5db 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -827,6 +827,11 @@ <permission android:name="android.permission.BIND_DIRECTORY_SEARCH" android:protectionLevel="signature|privileged" /> + <!-- @SystemApi @hide Allows an application to modify cell broadcasts through the content provider. + <p>Not for use by third-party applications. --> + <permission android:name="android.permission.MODIFY_CELL_BROADCASTS" + android:protectionLevel="signature|system" /> + <!-- =============================================================== --> <!-- Permissions for setting the device alarm --> <!-- =============================================================== --> |