summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-04-18 00:26:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-04-18 00:26:24 +0000
commit3eb9626bc03ad98119c2d2922c332bbf90c7c982 (patch)
tree26aa9553b191811e8cb6c7314bf3a6daa5f5ee55
parent1dd810c15784282924e87411b6e8bb56b072c06e (diff)
parent60212085c493e3897be309b7435e9d7180be2fef (diff)
Merge "Clarify capabilities granted by CALL_PHONE permission." into udc-dev
-rw-r--r--core/res/AndroidManifest.xml3
-rw-r--r--core/res/res/values/strings.xml3
2 files changed, 5 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9a5450068fb3..e62477f0dbe3 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1466,6 +1466,9 @@
<!-- Allows an application to initiate a phone call without going through
the Dialer user interface for the user to confirm the call.
+ <p>
+ <em>Note: An app holding this permission can also call carrier MMI codes to change settings
+ such as call forwarding or call waiting preferences.
<p>Protection level: dangerous
-->
<permission android:name="android.permission.CALL_PHONE"
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 362d8596ebb8..b0932d60c39a 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1452,7 +1452,8 @@
without your intervention. This may result in unexpected charges or calls.
Note that this doesn\'t allow the app to call emergency numbers.
Malicious apps may cost you money by making calls without your
- confirmation.</string>
+ confirmation, or dial carrier codes which cause incoming calls to be
+ automatically forwarded to another number.</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_accessImsCallService">access IMS call service</string>