commit 59edcfbc09e00712cf0da3692e93497c99c8dbbc
author Yorke Lee <yorkelee@google.com> Mon Nov 17 22:28:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 17 22:28:08 2014 +0000
tree a101e678a9b81628c4ff4bf1335942256f8c7b58
parent 8c258ac5eee9d1e0c3f8a4d895dda84a2c9ac71a
parent 4e97e09f0ae58f6065252022fe5cf5f7d90aef01

am 4e97e09f: Switch from CALL -> CALL_PRIVILEGED

* commit '4e97e09f0ae58f6065252022fe5cf5f7d90aef01':
  Switch from CALL -> CALL_PRIVILEGED

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 477a44c..b5cc33d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,6 +19,7 @@
     coreApp="true">
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.READ_CALL_LOG" />

src/com/android/dialer/util/DialerUtils.java

diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java
index 9cd4d99..a747c74 100644
--- a/src/com/android/dialer/util/DialerUtils.java
+++ b/src/com/android/dialer/util/DialerUtils.java
@@ -71,7 +71,8 @@
      */
     public static void startActivityWithErrorToast(Context context, Intent intent, int msgId) {
         try {
-            if (Intent.ACTION_CALL.equals(intent.getAction())) {
+            if (Intent.ACTION_CALL.equals(intent.getAction())
+                    || Intent.ACTION_CALL_PRIVILEGED.equals(intent.getAction())) {
                 // All dialer-initiated calls should pass the touch point to the InCallUI
                 Point touchPoint = TouchPointManager.getInstance().getPoint();
                 if (touchPoint.x != 0 || touchPoint.y != 0) {