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

28
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -356,6 +356,14 @@ public abstract class ConnectionService extends Service {
public void onConnectionRemoved(Conference conference, Connection connection) {
}
@Override
public void onConferenceableConnectionsChanged(
Conference conference, List<Connection> conferenceableConnections) {
mAdapter.setConferenceableConnections(
mIdByConference.get(conference),
createConnectionIdList(conferenceableConnections));
}
@Override
public void onDestroyed(Conference conference) {
removeConference(conference);
@@ -635,19 +643,25 @@ public abstract class ConnectionService extends Service {
private void conference(String callId1, String callId2) {
Log.d(this, "conference %s, %s", callId1, callId2);
Connection connection1 = findConnectionForAction(callId1, "conference");
if (connection1 == getNullConnection()) {
Log.w(this, "Connection1 missing in conference request %s.", callId1);
return;
}
Connection connection2 = findConnectionForAction(callId2, "conference");
if (connection2 == getNullConnection()) {
Log.w(this, "Connection2 missing in conference request %s.", callId2);
return;
}
onConference(connection1, connection2);
Connection connection1 = findConnectionForAction(callId1, "conference");
if (connection1 == getNullConnection()) {
Conference conference1 = findConferenceForAction(callId1, "addConnection");
if (conference1 == getNullConference()) {
Log.w(this,
"Connection1 or Conference1 missing in conference request %s.",
callId1);
} else {
conference1.onMerge(connection2);
}
} else {
onConference(connection1, connection2);
}
}
private void splitFromConference(String callId) {