diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-06-11 17:02:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 17:02:25 +0000 |
| commit | 2bd4f7a892e22d41f4055027c7f0b21b3b4db03b (patch) | |
| tree | 8e436d080e3dd25aaf1d97635993b53d9a723245 | |
| parent | ebdf41adadf9cd7fd38868f811ffc9e5f614534c (diff) | |
| parent | a6d7bd355e37674b4982525227bc969ea3a0c738 (diff) | |
am a6d7bd35: Merge "Empty ACTION_DIAL intent launches favorites" into lmp-preview-dev
* commit 'a6d7bd355e37674b4982525227bc969ea3a0c738':
Empty ACTION_DIAL intent launches favorites
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index ad01b865b..a5b69997b 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -810,7 +810,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 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; |