diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-10-27 17:45:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-27 17:45:39 +0000 |
| commit | 7d7591f5644d58f561d74fb0899a452d0dad7f1e (patch) | |
| tree | 9aef8d6e1dc26bcdf2e846b5334f94b759f8a7ef /src | |
| parent | 2f44b3c979f292211982608869af3c07cba06620 (diff) | |
| parent | 6c86e632b5c5f65567e45114b6bd1ba48f5863d8 (diff) | |
Merge "Fix some broken Dialer tests" into lmp-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/util/DialerUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java index 9cd4d9936..10eadffd5 100644 --- a/src/com/android/dialer/util/DialerUtils.java +++ b/src/com/android/dialer/util/DialerUtils.java @@ -71,7 +71,7 @@ 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()) && 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) { |