diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-06-10 21:59:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 21:44:22 +0000 |
| commit | a6d7bd355e37674b4982525227bc969ea3a0c738 (patch) | |
| tree | 442f381873a693764b6aa32871ec2e2845ebb8b2 /src | |
| parent | aafbb4c4ea8d6ac1f06e4f459a7bcdaa4ca284b6 (diff) | |
| parent | 473dd6c9b6857f1effbe86f3a295006d661a22f0 (diff) | |
Merge "Empty ACTION_DIAL intent launches favorites" into lmp-preview-dev
Diffstat (limited to 'src')
| -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 d4ba6a225..ca588cfa8 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -753,7 +753,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; |