summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android
diff options
context:
space:
mode:
authormike dooley <mdooley@google.com>2014-10-09 19:17:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-09 19:17:14 +0000
commit6e24a156cd9a43ff782926a8d5618ed63944a933 (patch)
treeb168d7728749fe48a2c1d6890535a78f120963eb /telecomm/java/android
parentbb76d5cd886f34165e59a35a36c353fe559929c7 (diff)
parent3175824a783c5d45df91ccf84fab8304f4d353c4 (diff)
downloadframeworks_base-6e24a156cd9a43ff782926a8d5618ed63944a933.zip
frameworks_base-6e24a156cd9a43ff782926a8d5618ed63944a933.tar.gz
frameworks_base-6e24a156cd9a43ff782926a8d5618ed63944a933.tar.bz2
am 3175824a: am 879142bf: Fix hangouts conference calling regression.
* commit '3175824a783c5d45df91ccf84fab8304f4d353c4': Fix hangouts conference calling regression.
Diffstat (limited to 'telecomm/java/android')
-rw-r--r--telecomm/java/android/telecom/RemoteConnectionService.java2
1 files changed, 1 insertions, 1 deletions
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 @@ final class RemoteConnectionService {
}
private boolean hasConnection(String callId) {
- return mConferenceById.containsKey(callId);
+ return mConnectionById.containsKey(callId);
}
private RemoteConnection findConnectionForAction(