diff options
| author | Tyler Gunn <tgunn@google.com> | 2020-07-31 01:16:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-31 01:16:30 +0000 |
| commit | c0e4e1581a761bb24735e6c8b39b3d63217728db (patch) | |
| tree | a45009e00eeb9c5cdfdb83d255a1ebd50a705eda /telecomm/java/android/telecom/ConnectionService.java | |
| parent | f0eb770c2daf7266625433ce8a244e4318efa101 (diff) | |
| parent | dc82235933e1347c098448e99a8727c8c923a8e6 (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed am: 3772a5b3fd am: c5ef3b9cae am: 03921ada7b am: dc82235933
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377136
Change-Id: I99fa531f570a13fd3a27abf522383e631f86ceed
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()) |