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

Commit 6882f480 authored by Omkar Kolangade's avatar Omkar Kolangade Committed by android-build-merger
Browse files

Merge "IMS-VT: Update video state of the connection first." into mm-wireless-dev 

am: 2e4144af

* commit '2e4144af':
  IMS-VT: Update video state of the connection first.
parents 98a99db8 2e4144af

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

+2 −1
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ public class ImsPhoneCallTracker extends CallTracker { 
            mPendingMO = new ImsPhoneConnection(mPhone,

                    checkForTestEmergencyNumber(dialString), this, mForegroundCall,

                    isEmergencyNumber);

            mPendingMO.setVideoState(videoState);

        }

        addConnection(mPendingMO);
@@ -1074,9 +1075,9 @@ public class ImsPhoneCallTracker extends CallTracker { 
        // It should modify only other capabilities of call through updateMediaCapabilities

        // State updates will be triggered through individual callbacks

        // i.e. onCallHeld, onCallResume, etc and conn.update will be responsible for the update

        conn.updateMediaCapabilities(imsCall);

        if (ignoreState) {

            conn.updateAddressDisplay(imsCall);

            conn.updateMediaCapabilities(imsCall);

            conn.updateExtras(imsCall);

            return;

        }