Merge "Update language to comply with Android's inclusive language guidance"

2020-07-30 20:42:55 +00:00
parent 98973ea706 460360d6b8
commit a005cb30ed
23 changed files with 62 additions and 58 deletions
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -1864,6 +1864,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())