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

Commit ee275ae7 authored by Omkar Kolangade's avatar Omkar Kolangade Committed by Tyler Gunn
Browse files

IMS-VT: Update videoProvider in main thread 

Setting video provider in seperate thread is causing timing
issues due to which media signalling is happening on
video provider of closed session. So, process merge complete
indication after video provider is updated to ensure that
media signalling happens on video provider attached with
conference imscallsession.

Bug: 27170551
Change-Id: I9a5ca67402effbf22135addcbd3be240d36669b8
parent 7efd41c8

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

+9 −18
Original line number Diff line number Diff line
@@ -1494,11 +1494,6 @@ public final class ImsPhoneCallTracker extends CallTracker { 
            }

            foregroundImsPhoneCall.merge(peerImsPhoneCall, ImsPhoneCall.State.ACTIVE);



            // TODO Temporary code. Remove the try-catch block from the runnable once thread

            // synchronization is fixed.

            Runnable r = new Runnable() {

                @Override

                public void run() {

            try {

                final ImsPhoneConnection conn = findConnection(call);

                log("onCallMerged: ImsPhoneConnection=" + conn);
@@ -1508,10 +1503,6 @@ public final class ImsPhoneCallTracker extends CallTracker { 
            } catch (Exception e) {

                loge("onCallMerged: exception " + e);

            }

                }

            };



            ImsPhoneCallTracker.this.post(r);



            // After merge complete, update foreground as Active

            // and background call as Held, if background call exists