commit ab987408f1f66438e843ba0926fa9e0ddc3da60e
author Tyler Gunn <tgunn@google.com> Tue Aug 19 16:35:07 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 19 16:35:07 2014 +0000
tree 0d3dc85cca49c97ebe5bf7f9eac52decf678247e
parent 59268f17f74c859a48da5629d8ac94bbbcd59503
parent 632ef5aa774933dc93129ece85d7427d62a099e3

am 632ef5aa: Merge "Exposing in-call API to other implementing classes. (3/4)" into lmp-dev

* commit '632ef5aa774933dc93129ece85d7427d62a099e3':
  Exposing in-call API to other implementing classes. (3/4)

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fa13adf..05cd5b5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -40,6 +40,7 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />
     <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
     <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL" />
     <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />
@@ -294,7 +295,8 @@
         </receiver>
 
         <service android:name="com.android.incallui.InCallServiceImpl"
-                 android:process="com.android.incallui">
+                 android:process="com.android.incallui"
+                 android:permission="android.permission.BIND_INCALL_SERVICE" >
             <intent-filter>
                 <action android:name="android.telecomm.InCallService"/>
             </intent-filter>