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

Commit ac464da4 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Prevent preciseCallStateChanged from firing for media capabilities change." into mnc-dev

parents 79be8acd d8413260

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

+10 −9
Original line number Diff line number Diff line
@@ -940,8 +940,10 @@ public final class ImsPhoneCallTracker extends CallTracker { 
        // State updates will be triggered through individual callbacks

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

        if (ignoreState) {

            changed = conn.updateMediaCapabilities(imsCall);

        } else {

            conn.updateMediaCapabilities(imsCall);

            return;

        }



        changed = conn.update(imsCall, state);

        if (state == ImsPhoneCall.State.DISCONNECTED) {

            changed = conn.onDisconnect(cause) || changed;
@@ -949,7 +951,6 @@ public final class ImsPhoneCallTracker extends CallTracker { 
            conn.getCall().detach(conn);

            removeConnection(conn);

        }

        }



        if (changed) {

            if (conn.getCall() == mHandoverCall) return;