summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuchand Ghosh <suchan@codeaurora.org>2015-04-06 14:08:06 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2015-04-16 22:40:08 -0700
commit18404d34f667538940ed23dfe71cafb3274074cf (patch)
treedcb1d29a91c010b0442112fb54305cbd47b9f50a
parenteeedd7de11e2454f9a7eb13a137a2102bbb77430 (diff)
downloadandroid_packages_apps_Dialer-18404d34f667538940ed23dfe71cafb3274074cf.tar.gz
android_packages_apps_Dialer-18404d34f667538940ed23dfe71cafb3274074cf.tar.bz2
android_packages_apps_Dialer-18404d34f667538940ed23dfe71cafb3274074cf.zip
IMS: Don't set add participant extra if no call exist.
Dialer set add participant extra with the call intent irrespective of call exist. This leads to no Call UI display if dial a number immediately after add a participant and end the conf call to use same dialpad which launch earlier when the participant added. Add code to set add participant extra if user clicks on add participant and there is a call exist. Change-Id: Ifa18b26ed9ccd368afb930382d5e8aeaf8e9511a CRs-Fixed: 817666
-rwxr-xr-xsrc/com/android/dialer/dialpad/DialpadFragment.java2
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);
}