diff options
| author | Hall Liu <hallliu@google.com> | 2021-03-31 23:30:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-31 23:30:47 +0000 |
| commit | 1b53c7b5e1feba617a2c038b8ac86544d05045df (patch) | |
| tree | 72b68fa5e8830acb7df9746a209df6a2dc8200dd /telecomm | |
| parent | 8297a09b3cf4384c457f1e3be965c5ec6597190c (diff) | |
| parent | 9c05c40060dece9e08a60ab6a6e3ff572c4dddca (diff) | |
Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" am: 2e0c2171fd am: ff4a4a29e7 am: 9c05c40060
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358163
Change-Id: Icf555d5e3bceda3bc1260b64c6d7394d4f9adb50
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 2dc18e856349..73f1783a517e 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1183,6 +1183,10 @@ public abstract class Connection extends Conferenceable { builder.append(isLong ? " PROPERTY_IS_ADHOC_CONFERENCE" : " adhoc_conf"); } + if ((properties & PROPERTY_IS_DOWNGRADED_CONFERENCE) == PROPERTY_IS_DOWNGRADED_CONFERENCE) { + builder.append(isLong ? " PROPERTY_IS_DOWNGRADED_CONFERENCE" : " dngrd_conf"); + } + builder.append("]"); return builder.toString(); } |