diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-11-04 02:44:32 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-04 02:44:32 -0800 |
| commit | b59d8189fed931d934743357457821579187c281 (patch) | |
| tree | 9ec0b02fe2b29509e4ea9d5a8a600be9e8c34bcc /src/com | |
| parent | 76c9726e48ccbbcb5780ab076b7c54aadcdc621b (diff) | |
| parent | daba64924bbea8a0eb49723d69c1178a7c2ef0f2 (diff) | |
| download | packages_apps_Dialer-b59d8189fed931d934743357457821579187c281.tar.gz packages_apps_Dialer-b59d8189fed931d934743357457821579187c281.tar.bz2 packages_apps_Dialer-b59d8189fed931d934743357457821579187c281.zip | |
Merge "IMS: Fix empty URI list dial after add participant."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index e22a07bf6..e70773d6c 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -1222,8 +1222,8 @@ public class DialpadFragment extends Fragment mRecipients.getText().toString().trim(); if (isDigitsShown && isDigitsEmpty()) { handleDialButtonClickWithEmptyDigits(); - } else if (mAddParticipant && isDigitsEmpty() && mRecipients.isShown() - && isRecipientEmpty()) { + } else if (mAddParticipant && isPhoneInUse() && isDigitsEmpty() + && mRecipients.isShown() && isRecipientEmpty()) { // mRecipients must be empty // TODO add support for conference URI in last number dialed // use ErrorDialogFragment instead? also see |