diff options
| author | Jake Hamby <jhamby@google.com> | 2012-04-19 16:15:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 16:15:42 -0700 |
| commit | d65c2be5485143a0d489c6dfa24276ae834ccffc (patch) | |
| tree | 36e963c8d972c66948280afe33d6fb695759d19b /core/res | |
| parent | 875f0643164e2235de7256c0a256f9f4c8768fa2 (diff) | |
| parent | c3296ffdfc70c6778b6ae760b812b4e53e335f97 (diff) | |
| download | frameworks_base-d65c2be5485143a0d489c6dfa24276ae834ccffc.zip frameworks_base-d65c2be5485143a0d489c6dfa24276ae834ccffc.tar.gz frameworks_base-d65c2be5485143a0d489c6dfa24276ae834ccffc.tar.bz2 | |
Merge "Add ContentProvider for apps to read received SMS cell broadcasts."
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 17 | ||||
| -rwxr-xr-x | core/res/res/values/strings.xml | 9 |
2 files changed, 26 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b7ee2ec..4443bc8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -202,6 +202,23 @@ android:label="@string/permlab_receiveEmergencyBroadcast" android:description="@string/permdesc_receiveEmergencyBroadcast" /> + <!-- Allows an application to read previously received cell broadcast + messages and to register a content observer to get notifications when + a cell broadcast has been received and added to the database. For + emergency alerts, the database is updated immediately after the + alert dialog and notification sound/vibration/speech are presented. + The "read" column is then updated after the user dismisses the alert. + This enables supplementary emergency assistance apps to start loading + additional emergency information (if Internet access is available) + when the alert is first received, and to delay presenting the info + to the user until after the initial alert dialog is dismissed. + @hide Pending API council approval --> + <permission android:name="android.permission.READ_CELL_BROADCASTS" + android:permissionGroup="android.permission-group.MESSAGES" + android:protectionLevel="dangerous" + android:label="@string/permlab_readCellBroadcasts" + android:description="@string/permdesc_readCellBroadcasts" /> + <!-- Allows an application to read SMS messages. --> <permission android:name="android.permission.READ_SMS" android:permissionGroup="android.permission-group.MESSAGES" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 7df24a2..149a78c 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -474,6 +474,15 @@ and process emergency broadcast messages. This permission is only available to system apps.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_readCellBroadcasts">read cell broadcast messages</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_readCellBroadcasts">Allows the app to read + cell broadcast messages received by your device. Cell broadcast alerts + are delivered in some locations to warn you of emergency situations. + Malicious apps may interfere with the performance or operation of your + device when an emergency cell broadcast is received.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_sendSms">send SMS messages</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> |