diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-12-03 01:38:59 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-12-03 01:38:59 +0000 |
| commit | 895d849303733339a87eb54713bab7ceae19973e (patch) | |
| tree | a3bd5754ee29a7d87b04200930d98632d12bcbc3 | |
| parent | 24f8779ce2e411ad7f7703af69f77557e86c8adf (diff) | |
| parent | 140247da793bcf4b06d66b0bc191f1a05807d116 (diff) | |
| download | android_packages_apps_Dialer-895d849303733339a87eb54713bab7ceae19973e.tar.gz android_packages_apps_Dialer-895d849303733339a87eb54713bab7ceae19973e.tar.bz2 android_packages_apps_Dialer-895d849303733339a87eb54713bab7ceae19973e.zip | |
Merge tag 'android-5.0.1_r1' into HEAD
Android 5.0.1 release 1
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/dialer/util/DialerUtils.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f29a18f2a..bb8fb7c0b 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) { |