diff options
| author | Ihab Awad <ihab@google.com> | 2014-10-01 14:31:01 -0700 |
|---|---|---|
| committer | Ihab Awad <ihab@google.com> | 2014-10-01 14:31:01 -0700 |
| commit | 12a4df2b66fccbc1e4293e8f56217e1064b2e8ea (patch) | |
| tree | 22c74f18cddcc93f92a6961c5527226a622bfbed /telecomm/java/android/telecom/Connection.java | |
| parent | 3867e4d0c08ad74ee16dfde70e81c77f09e0e0ff (diff) | |
| parent | ead63f02006039655e3f2733ba27e19d158da432 (diff) | |
| download | frameworks_base-12a4df2b66fccbc1e4293e8f56217e1064b2e8ea.zip frameworks_base-12a4df2b66fccbc1e4293e8f56217e1064b2e8ea.tar.gz frameworks_base-12a4df2b66fccbc1e4293e8f56217e1064b2e8ea.tar.bz2 | |
resolved conflicts for merge of ead63f02 to lmp-mr1-dev
Change-Id: I20d5f9d8aae82f0cb6f0ebf2ac1cb0af05eb8c9b
Diffstat (limited to 'telecomm/java/android/telecom/Connection.java')
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 7979e44..2227a04 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -867,7 +867,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; @@ -1097,7 +1097,7 @@ public abstract class Connection { private final void fireOnConferenceableConnectionsChanged() { for (Listener l : mListeners) { - l.onConferenceableConnectionsChanged(this, mConferenceableConnections); + l.onConferenceableConnectionsChanged(this, getConferenceableConnections()); } } |