commit 0ddc1261d78d4040ff73f8d38fc848f544c45380
author Hall Liu <hallliu@google.com> Wed Mar 31 23:02:00 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 31 23:02:00 2021 +0000
tree 4a9f232d65075865c595198e32f5241715129811
parent efc224d91f2b400e9d70ede4942e01b6c4f04c78
parent 098cdccc5b80f76f3c8f8ecc28070259b56fedfb

Merge "Unset conference state when dng_cnf removed" am: a40bcd1434 am: 098cdccc5b

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

Change-Id: Ie88e7ed91c414461b8eb07d60d2f8a81f4ae2b3e

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

diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 15f9cd1..16bb551 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -1973,6 +1973,16 @@
                 }
             }
 
+            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;