Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of ead63f02 to lmp-mr1-dev

Browse Source 
Change-Id: I20d5f9d8aae82f0cb6f0ebf2ac1cb0af05eb8c9b
This commit is contained in:
Ihab Awad
2014-10-01 14:31:01 -07:00
parent 3867e4d0c0 ead63f0200
commit 12a4df2b66
5 changed files with 114 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telecomm/java/android/telecom/Connection.java
View File

@@ -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());
}
}