summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shuo Qian <shuoq@google.com> 2020-12-11 04:37:43 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-12-11 04:37:43 +0000
commit00da245beb959688a1d7161c6611457ccbf62d86 (patch)
treea9a7a581485bf1ed33bc88a74c0eae08cbfe2887
parentf52311f65820ae58a14bb38b818b31dd84d5bc92 (diff)
parent3c8bac198e73c98b570d61c08ee62736fd072dbe (diff)
Merge "Add title and description of MANAGE_ONGOING_CALLS"
-rw-r--r--core/res/AndroidManifest.xml4
-rw-r--r--core/res/res/values/strings.xml9
2 files changed, 12 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index bd8c73435de3..c8aedfb8a835 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2259,7 +2259,9 @@
<!-- Allows to query ongoing call details and manage ongoing calls
<p>Protection level: signature|appop -->
<permission android:name="android.permission.MANAGE_ONGOING_CALLS"
- android:protectionLevel="signature|appop" />
+ android:protectionLevel="signature|appop"
+ android:label="@string/permlab_manageOngoingCalls"
+ android:description="@string/permdesc_manageOngoingCalls" />
<!-- Allows the app to request network scans from telephony.
<p>Not for use by third-party applications.
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 89b986b8fcb8..31aee4a2e8b4 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -928,6 +928,15 @@
interfere with the performance or operation of your device when an
emergency cell broadcast is received.</string>
+ <!-- Title for an application which grants an app the ability to see and manage calls on
+ the user's device. Usually reserved for apps associated with wearable devices that
+ can show information about calls. -->
+ <string name="permlab_manageOngoingCalls">Manage ongoing 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_manageOngoingCalls">Allows an app to see details about ongoing calls
+ on your device and to control these calls.</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. -->