diff options
| author | Tyler Gunn <tgunn@google.com> | 2020-07-30 21:25:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-30 21:25:38 +0000 |
| commit | c5ef3b9cae2a2917a4a98bc9ba65f7abcfb605f9 (patch) | |
| tree | 8e0d52d74951764b4dd5bebe0a5f1e71ebfd5157 /telecomm/java/android/telecom/ConnectionService.java | |
| parent | f761a5add1a3048a198e0f531fa501792af17ec2 (diff) | |
| parent | 3772a5b3fd5cbf2439a9c575c0a1ffec254b6320 (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed am: 3772a5b3fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377136
Change-Id: I2f838a951cec8f6e7af82a0cd08d99d6045f3952
Diffstat (limited to 'telecomm/java/android/telecom/ConnectionService.java')
| -rwxr-xr-x | telecomm/java/android/telecom/ConnectionService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 780a7c257aa7..3646647e9734 100755 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -1880,6 +1880,7 @@ public abstract class ConnectionService extends Service { mConferenceById.put(callId, conference); mIdByConference.put(conference, callId); + conference.addListener(mConferenceListener); ParcelableConference parcelableConference = new ParcelableConference.Builder( request.getAccountHandle(), conference.getState()) |