diff options
| author | 2021-01-07 18:56:55 +0000 | |
|---|---|---|
| committer | 2021-01-07 18:56:55 +0000 | |
| commit | c33f2e50b4b851374aad376401808a4637f0ceec (patch) | |
| tree | 9650d2c319d2013a0ca422540334bcc126460dfd | |
| parent | edeb75ca4c1f935893d939fc8c7a57157bccfc3c (diff) | |
| parent | 4506656274d6c4c54bec82da64f271486305a9ff (diff) | |
Merge "Add title and description of MANAGE_ONGOING_CALLS" am: 4506656274
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534265
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id40ac228e5771419a88bc47977eb74819b313ca4
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a9fe5d58af05..714a09d02264 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2206,7 +2206,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 c1f3028c9931..1143467425af 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -914,6 +914,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. --> |