Merge "IMS-VT: Update video state of the connection first." into mm-wireless-dev (2e4144af) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -400,6 +400,7 @@ public class ImsPhoneCallTracker extends CallTracker {
		mPendingMO = new ImsPhoneConnection(mPhone,
		checkForTestEmergencyNumber(dialString), this, mForegroundCall,
		isEmergencyNumber);
		mPendingMO.setVideoState(videoState);
		}
		addConnection(mPendingMO);

		@@ -1073,9 +1074,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;
		}