summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2014-03-03 16:06:54 -0800
committerSantos Cordon <santoscordon@google.com>2014-03-04 18:51:18 -0800
commitb4aeac730503eb4b9db7d2dcece48e1ca13b4b30 (patch)
tree1cc33ca4ec13f8d8071dedf30413d26ae0f3c762 /core/res
parent15e0e8e514c26d6168ebfb28c015af5f1d06661c (diff)
downloadframeworks_base-b4aeac730503eb4b9db7d2dcece48e1ca13b4b30.zip
frameworks_base-b4aeac730503eb4b9db7d2dcece48e1ca13b4b30.tar.gz
frameworks_base-b4aeac730503eb4b9db7d2dcece48e1ca13b4b30.tar.bz2
Updating wording around PROCESS_INCOMING_CALL.
bug: 12175514 Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml5
-rw-r--r--core/res/res/values/strings.xml6
2 files changed, 6 insertions, 5 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 55e21de..4c0ddeb 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1071,8 +1071,9 @@
android:permissionGroupFlags="personalInfo"
android:priority="370" />
- <!-- Allows an application to modify or abort outgoing
- calls. -->
+ <!-- Allows an application to see the number being dialed during an outgoing
+ call with the option to redirect the call to a different number or
+ abort the call altogether. -->
<permission android:name="android.permission.PROCESS_OUTGOING_CALLS"
android:permissionGroup="android.permission-group.PHONE_CALLS"
android:protectionLevel="dangerous"
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 91bef50..afb7085 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -625,9 +625,9 @@
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_processOutgoingCalls">reroute outgoing calls</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_processOutgoingCalls">Allows the app to process
- outgoing calls and change the number to be dialed. This permission allows
- the app to monitor, redirect, or prevent outgoing calls.</string>
+ <string name="permdesc_processOutgoingCalls">Allows the app to see the
+ number being dialed during an outgoing call with the option to redirect
+ the call to a different number or abort the call altogether.</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_receiveSms">receive text messages (SMS)</string>