diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-11-17 22:59:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 22:59:27 +0000 |
| commit | 8a1dde275a08c273f4b24c95f4c876133625dd84 (patch) | |
| tree | e4d7f17639cbacb60aa5fd8e5b1ec38e9d36836a | |
| parent | afe050a8718720f546f5ea17c9f92fdeb6da8895 (diff) | |
| parent | db49e19578325a4bb316c342e0fa4266aa7def01 (diff) | |
| download | android_packages_apps_Dialer-8a1dde275a08c273f4b24c95f4c876133625dd84.tar.gz android_packages_apps_Dialer-8a1dde275a08c273f4b24c95f4c876133625dd84.tar.bz2 android_packages_apps_Dialer-8a1dde275a08c273f4b24c95f4c876133625dd84.zip | |
am db49e195: Merge commit \'59edcfbc\' into manualmerge
* commit 'db49e19578325a4bb316c342e0fa4266aa7def01':
Switch from CALL -> CALL_PRIVILEGED
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/dialer/util/DialerUtils.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 81ae89a57..861fd1dbc 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 10eadffd5..153f762e7 100644 --- a/src/com/android/dialer/util/DialerUtils.java +++ b/src/com/android/dialer/util/DialerUtils.java @@ -71,7 +71,9 @@ public class DialerUtils { */ public static void startActivityWithErrorToast(Context context, Intent intent, int msgId) { try { - if (Intent.ACTION_CALL.equals(intent.getAction()) && context instanceof Activity) { + if ((Intent.ACTION_CALL.equals(intent.getAction()) + || Intent.ACTION_CALL_PRIVILEGED.equals(intent.getAction())) + && context instanceof Activity) { // All dialer-initiated calls should pass the touch point to the InCallUI Point touchPoint = TouchPointManager.getInstance().getPoint(); if (touchPoint.x != 0 || touchPoint.y != 0) { |