diff options
author | rongmei.li <rongmei.li@unisoc.com> | 2020-03-03 14:31:06 +0800 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2020-05-24 20:09:50 +0300 |
commit | 9c227fe71f110060f43e6b52314542733094cff8 (patch) | |
tree | 6a3242e2476f94c5ed16c0e77a4f3ebdaa428c71 | |
parent | bdfb33d5484b60a37cdf6e754b08b6dd1606b30d (diff) | |
download | android_packages_apps_Dialer-9c227fe71f110060f43e6b52314542733094cff8.tar.gz android_packages_apps_Dialer-9c227fe71f110060f43e6b52314542733094cff8.tar.bz2 android_packages_apps_Dialer-9c227fe71f110060f43e6b52314542733094cff8.zip |
Failed to show hold call when user click swap and merge simultaneously
Set EVENT_MERGE_START for foregroundConnection and backgroundConnection
but don't set EVENT_MERGE_COMPLETE when there is ImsException
Bug: 121105030
Change-Id: Ib376b24e5d307d8907d7ec2c8a3e025c04682d88
-rw-r--r-- | java/com/android/incallui/call/DialerCall.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index 06bd9260e..b02894683 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -345,6 +345,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa // now update the UI to possibly re-enable the Merge button based on the number of // currently conferenceable calls available or Connection Capabilities. case android.telecom.Connection.EVENT_CALL_MERGE_FAILED: + isMergeInProcess = false; update(); break; case TelephonyManagerCompat.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE: |