am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev

* commit 'e0b7e4cf455b21316661b158edee12ac5467995c':
  Add permissions for the InCallUI Split.
This commit is contained in:
Santos Cordon
2013-09-11 12:10:13 -07:00
committed by Android Git Automerger
2 changed files with 7 additions and 0 deletions

View File

@@ -20,6 +20,7 @@ package android {
field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";
field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";
field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";
field public static final java.lang.String BIND_CALL_SERVICE = "android.permission.BIND_CALL_SERVICE";
field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";

View File

@@ -1103,6 +1103,12 @@
android:description="@string/permdesc_use_sip"
android:label="@string/permlab_use_sip" />
<!-- Allows an application to request CallHandlerService implementations. -->
<permission android:name="android.permission.BIND_CALL_SERVICE"
android:permissionGroup="android.permission-group.PHONE_CALLS"
android:protectionLevel="system" />
<!-- ================================== -->
<!-- Permissions for sdcard interaction -->
<!-- ================================== -->