diff options
| author | 2013-09-12 01:02:45 +0000 | |
|---|---|---|
| committer | 2013-09-12 01:02:45 +0000 | |
| commit | e4fdc84794923f9408fc400ed9177178329a08cd (patch) | |
| tree | 4cbf59b000295189c8773f8754087c6622ca946f | |
| parent | 03ad7ae1bc406dbdb452cb5f91f2bde1848fd4cb (diff) | |
| parent | 41b9ef9c4e175770e4ccef3d83d117f404915b48 (diff) | |
Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/api/current.txt b/api/current.txt index 9252152d15ec..91fcab1e8a7d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20,7 +20,6 @@ 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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a1942406b6c6..499a930d86b2 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1103,12 +1103,6 @@ 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 --> <!-- ================================== --> |