diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-04-17 09:57:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-17 09:57:59 -0700 |
| commit | 0b597cc753a3aeb3eda2f7a121e2972d638bea6d (patch) | |
| tree | dcb1d29a91c010b0442112fb54305cbd47b9f50a | |
| parent | eeedd7de11e2454f9a7eb13a137a2102bbb77430 (diff) | |
| parent | 18404d34f667538940ed23dfe71cafb3274074cf (diff) | |
| download | android_packages_apps_Dialer-0b597cc753a3aeb3eda2f7a121e2972d638bea6d.tar.gz android_packages_apps_Dialer-0b597cc753a3aeb3eda2f7a121e2972d638bea6d.tar.bz2 android_packages_apps_Dialer-0b597cc753a3aeb3eda2f7a121e2972d638bea6d.zip | |
Merge "IMS: Don't set add participant extra if no call exist."
| -rwxr-xr-x | src/com/android/dialer/dialpad/DialpadFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index b497f3736..d2e8ed0c7 100755 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -1344,7 +1344,7 @@ public class DialpadFragment extends AnalyticsFragment // must be dial conference add extra intent.putExtra(TelephonyProperties.EXTRA_DIAL_CONFERENCE_URI, true); } - intent.putExtra(ADD_PARTICIPANT_KEY, mAddParticipant); + intent.putExtra(ADD_PARTICIPANT_KEY, (mAddParticipant && isPhoneInUse())); DialerUtils.startActivityWithErrorToast(getActivity(), intent); hideAndClearDialpad(false); } |