summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/Connection.java
diff options
context:
space:
mode:
authorIhab Awad <ihab@google.com>2014-09-30 09:17:03 -0700
committerIhab Awad <ihab@google.com>2014-09-30 16:46:39 -0700
commit50e3506533478fa273cbc92c2919470d1889f1ed (patch)
tree2427095ce136a68b7ee48827bd9bac8bed934dcd /telecomm/java/android/telecom/Connection.java
parent9cf01b63cb0023aec0e05b1ce050ff572532b876 (diff)
downloadframeworks_base-50e3506533478fa273cbc92c2919470d1889f1ed.zip
frameworks_base-50e3506533478fa273cbc92c2919470d1889f1ed.tar.gz
frameworks_base-50e3506533478fa273cbc92c2919470d1889f1ed.tar.bz2
Refine implementation of GSM conferences (1/3)
Bug: 17684223 Change-Id: I05d05b594803ea2c1da4247111b70ad5f870ac46
Diffstat (limited to 'telecomm/java/android/telecom/Connection.java')
-rw-r--r--telecomm/java/android/telecom/Connection.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 13acc59..b5f6692 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -870,7 +870,7 @@ public abstract class Connection {
}
/**
- * Obtains the connections with which this connection can be conferenced.
+ * Returns the connections with which this connection can be conferenced.
*/
public final List<Connection> getConferenceableConnections() {
return mUnmodifiableConferenceableConnections;
@@ -1100,7 +1100,7 @@ public abstract class Connection {
private final void fireOnConferenceableConnectionsChanged() {
for (Listener l : mListeners) {
- l.onConferenceableConnectionsChanged(this, mConferenceableConnections);
+ l.onConferenceableConnectionsChanged(this, getConferenceableConnections());
}
}