commit 2bd4f7a892e22d41f4055027c7f0b21b3b4db03b
author Yorke Lee <yorkelee@google.com> Wed Jun 11 17:02:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 11 17:02:25 2014 +0000
tree 8e436d080e3dd25aaf1d97635993b53d9a723245
parent ebdf41adadf9cd7fd38868f811ffc9e5f614534c
parent a6d7bd355e37674b4982525227bc969ea3a0c738

am a6d7bd35: Merge "Empty ACTION_DIAL intent launches favorites" into lmp-preview-dev

* commit 'a6d7bd355e37674b4982525227bc969ea3a0c738':
  Empty ACTION_DIAL intent launches favorites

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index ad01b86..a5b6999 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -810,7 +810,7 @@
 
         if (mDialpadFragment != null) {
             final boolean phoneIsInUse = phoneIsInUse();
-            if (phoneIsInUse || isDialIntent(intent)) {
+            if (phoneIsInUse || (intent.getData() !=  null && isDialIntent(intent))) {
                 mDialpadFragment.setStartedFromNewIntent(true);
                 if (phoneIsInUse && !mDialpadFragment.isVisible()) {
                     mInCallDialpadUp = true;