Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5bf4d81 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "IMS: Clear 'Merge Triggered By Conference' Flag" am: b3ded9b8 am: f954d91e 

am: 5c0ca16a

Change-Id: I8276a505b81c623ece3a489e7c03743203a41211
parents e74ca95c 5c0ca16a

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+2 −0
Original line number Diff line number Diff line
@@ -2613,6 +2613,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            // based on the user facing UI.

            mPhone.notifySuppServiceFailed(Phone.SuppService.CONFERENCE);



            call.resetIsMergeRequestedByConf(false);



            // Start plumbing this even through Telecom so other components can take

            // appropriate action.

            ImsPhoneConnection conn = findConnection(call);