commit 140247da793bcf4b06d66b0bc191f1a05807d116
author Yorke Lee <yorkelee@google.com> Mon Nov 17 12:32:55 2014 -0800
committer The Android Automerger <android-build@google.com> Tue Nov 18 10:44:34 2014 -0800
tree b1c6d76aa2fa75bac03de0683b88af63a10af69a
parent 48b3c3bec0090641dc60f476d113bab11b7d7e4a

Switch from CALL -> CALL_PRIVILEGED

Bug: 18332160
Change-Id: I5b9bcc8f413e5534bab94e0b2677371968a8e483

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) {