From 879142bf1c6b72670d4aedac82938f00a97acf5b Mon Sep 17 00:00:00 2001
From: mike dooley <mdooley@google.com>
Date: Wed, 8 Oct 2014 13:39:28 -0700
Subject: [PATCH] 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
---
 telecomm/java/android/telecom/RemoteConnectionService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java
index de1dc1723fe49..af4ee22ef2af3 100644
--- a/telecomm/java/android/telecom/RemoteConnectionService.java
+++ b/telecomm/java/android/telecom/RemoteConnectionService.java
@@ -365,7 +365,7 @@ final class RemoteConnectionService {
     }
 
     private boolean hasConnection(String callId) {
-        return mConferenceById.containsKey(callId);
+        return mConnectionById.containsKey(callId);
     }
 
     private RemoteConnection findConnectionForAction(