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

DO NOT MERGE Remove connection substate

Browse Source 
Bug:20300433
Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
This commit is contained in:
Jay Shrauner
2015-04-16 12:52:19 -07:00
parent c8769de831
commit 6f20a6a2b4
11 changed files with 10 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,13 +562,6 @@ public abstract class ConnectionService extends Service {
mAdapter.setIsConferenced(id, conferenceId);
}
}
@Override
public void onCallSubstateChanged(Connection c, int callSubstate) {
String id = mIdByConnection.get(c);
Log.d(this, "Adapter set call substate %d", callSubstate);
mAdapter.setCallSubstate(id, callSubstate);
}
};
/** {@inheritDoc} */
@@ -638,8 +631,7 @@ public abstract class ConnectionService extends Service {
connection.getAudioModeIsVoip(),
connection.getStatusHints(),
connection.getDisconnectCause(),
createIdList(connection.getConferenceables()),
connection.getCallSubstate()));
createIdList(connection.getConferenceables())));
}
private void abort(String callId) {
@@ -963,7 +955,7 @@ public abstract class ConnectionService extends Service {
connection.getAudioModeIsVoip(),
connection.getStatusHints(),
connection.getDisconnectCause(),
emptyList, connection.getCallSubstate());
emptyList);
mAdapter.addExistingConnection(id, parcelableConnection);
}
}