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

Commit 32930206 authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Unset conference state when dng_cnf removed" am: a40bcd14 am: 098cdccc am: 0ddc1261 

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1584813

Change-Id: I87a1644cc4bcf338af8ab9dc36b947b4f0134251
parents b269920b 0ddc1261

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

+10 −0
Original line number Diff line number Diff line
@@ -2016,6 +2016,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;