summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-11-17 12:32:55 -0800
committerThe Android Automerger <android-build@google.com>2014-11-18 10:44:34 -0800
commit140247da793bcf4b06d66b0bc191f1a05807d116 (patch)
treeb1c6d76aa2fa75bac03de0683b88af63a10af69a
parent48b3c3bec0090641dc60f476d113bab11b7d7e4a (diff)
downloadandroid_packages_apps_Dialer-140247da793bcf4b06d66b0bc191f1a05807d116.tar.gz
android_packages_apps_Dialer-140247da793bcf4b06d66b0bc191f1a05807d116.tar.bz2
android_packages_apps_Dialer-140247da793bcf4b06d66b0bc191f1a05807d116.zip
Switch from CALL -> CALL_PRIVILEGED
Bug: 18332160 Change-Id: I5b9bcc8f413e5534bab94e0b2677371968a8e483
-rw-r--r--AndroidManifest.xml1
-rw-r--r--src/com/android/dialer/util/DialerUtils.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 477a44cee..b5cc33dc1 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" />
diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java
index 9cd4d9936..a747c74aa 100644
--- a/src/com/android/dialer/util/DialerUtils.java
+++ b/src/com/android/dialer/util/DialerUtils.java
@@ -71,7 +71,8 @@ public class DialerUtils {
*/
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) {