summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2015-07-08 04:01:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-08 04:02:08 +0000
commit3e639057b8d9c4287bc5e92ce29c122e805bbe17 (patch)
tree52f953dbe73a1dad9fed94d558d915746bbf71cb /core
parentebfe2be18a954328045a159000c5d5fa8e37dd83 (diff)
parentbbf40aeab3445dc81e37b1e47f25c8e47ae035d8 (diff)
downloadframeworks_base-3e639057b8d9c4287bc5e92ce29c122e805bbe17.zip
frameworks_base-3e639057b8d9c4287bc5e92ce29c122e805bbe17.tar.gz
frameworks_base-3e639057b8d9c4287bc5e92ce29c122e805bbe17.tar.bz2
Merge "Add ACCESS_IMS_CALL_SERVICE hidden permission." into mnc-dev
Diffstat (limited to 'core')
-rw-r--r--core/res/AndroidManifest.xml12
-rw-r--r--core/res/res/values/strings.xml5
2 files changed, 17 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 074d1bd..0617b4f 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -590,6 +590,18 @@
android:description="@string/permdesc_callPhone"
android:protectionLevel="dangerous" />
+ <!-- Allows an application to access the IMS call service: making and
+ modifying a call
+ <p>Protection level: signature|system
+ @hide
+ -->
+ <permission android:name="android.permission.ACCESS_IMS_CALL_SERVICE"
+ android:permissionGroup="android.permission-group.PHONE"
+ android:permissionFlags="hide"
+ android:label="@string/permlab_accessImsCallService"
+ android:description="@string/permdesc_accessImsCallService"
+ android:protectionLevel="signature|system" />
+
<!-- Allows an application to read the user's call log.
<p class="note"><strong>Note:</strong> If your app uses the
{@link #READ_CONTACTS} permission and <em>both</em> your <a
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 680a1ab..7c5ec4d 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1001,6 +1001,11 @@
confirmation.</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>
+ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permdesc_accessImsCallService">Allows the app to use the IMS service to make calls without your intervention.</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_readPhoneState">read phone status and identity</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_readPhoneState">Allows the app to access the phone