diff options
| author | Bryce Lee <brycelee@google.com> | 2015-08-17 19:54:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-17 19:54:19 +0000 |
| commit | d74a66bd97ed52fc985e9fa145072a9fc4e0a3e3 (patch) | |
| tree | 720fee87c385be7538299912b88c65a554a41252 | |
| parent | 88c4e40636e2d2022b7afdacccb4de0d07d7703f (diff) | |
| parent | f82631ff35e22f43ed7e79e9fbc75ca241aae70a (diff) | |
| download | frameworks_base-d74a66bd97ed52fc985e9fa145072a9fc4e0a3e3.zip frameworks_base-d74a66bd97ed52fc985e9fa145072a9fc4e0a3e3.tar.gz frameworks_base-d74a66bd97ed52fc985e9fa145072a9fc4e0a3e3.tar.bz2 | |
Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
| -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 fa08eba..f464292 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 79ba355..ec98aba 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 --> <!-- =============================================================== --> |