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

Commit a40bcd14 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Unset conference state when dng_cnf removed"

parents 12996252 eb1fff10

src/com/android/server/telecom/Call.java

+10 −0
Original line number Diff line number Diff line
@@ -1973,6 +1973,16 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
                }

            }



            boolean wasDowngradedConference =

                    (previousProperties & Connection.PROPERTY_IS_DOWNGRADED_CONFERENCE) != 0;

            boolean isDowngradedConference =

                    (connectionProperties & Connection.PROPERTY_IS_DOWNGRADED_CONFERENCE) != 0;

            if (wasDowngradedConference && !isDowngradedConference) {

                Log.i(this, "DOWNGRADED_CONFERENCE property removed; setting"

                        + " conference state to false");

                setConferenceState(false);

            }



            mAnalytics.addCallProperties(mConnectionProperties);



            int xorProps = previousProperties ^ mConnectionProperties;