summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-11-17 14:38:59 -0800
committerYorke Lee <yorkelee@google.com>2014-11-17 14:38:59 -0800
commitdb49e19578325a4bb316c342e0fa4266aa7def01 (patch)
tree17e720ef062e6010a6d08b74716fc125029f9eda
parent0274a22bd9c8fd6037c6a251174dd92ddeada016 (diff)
parent59edcfbc09e00712cf0da3692e93497c99c8dbbc (diff)
Merge commit '59edcfbc' into manualmerge
Change-Id: I0d26d0510edf5ea49d77d8c3c7ecd657b5989d52
-rw-r--r--AndroidManifest.xml1
-rw-r--r--src/com/android/dialer/util/DialerUtils.java4
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) {