| commit | 879142bf1c6b72670d4aedac82938f00a97acf5b | [log] [tgz] |
|---|---|---|
| author | mike dooley <mdooley@google.com> | Wed Oct 08 13:39:28 2014 -0700 |
| committer | Michael Dooley <mdooley@google.com> | Thu Oct 09 01:15:58 2014 +0000 |
| tree | 7fe88bbf77e8cb0bca5d6bcb3f003eb9897e8da7 | |
| parent | 37bd07768a05aabb0905608606f354a488a2d5cf [diff] [blame] |
Fix hangouts conference calling regression. Check the connection-by-id hash table instead of conference-by-id hash table when setting conferenceable connections. Bug: 17919110 Change-Id: Ia8a5ab3fb96926e600d21eca7737a0044b233563
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index de1dc17..af4ee22 100644 --- a/telecomm/java/android/telecom/RemoteConnectionService.java +++ b/telecomm/java/android/telecom/RemoteConnectionService.java
@@ -365,7 +365,7 @@ } private boolean hasConnection(String callId) { - return mConferenceById.containsKey(callId); + return mConnectionById.containsKey(callId); } private RemoteConnection findConnectionForAction(