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

Add null pointer check in removeConnection

Browse Source 
Bug: 28607777
Change-Id: I199ed75740796540d243ad9f507ab2511c9ed3c1
This commit is contained in:
Chenjie Luo
2016-05-12 16:59:43 -07:00
parent 7ac638702d
commit e370b538eb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1187,12 +1187,14 @@ public abstract class ConnectionService extends Service {
/** {@hide} */ /** {@hide} */
protected void removeConnection(Connection connection) { protected void removeConnection(Connection connection) {
String id = mIdByConnection.get(connection);
connection.unsetConnectionService(this); connection.unsetConnectionService(this);
connection.removeConnectionListener(mConnectionListener); connection.removeConnectionListener(mConnectionListener);
mConnectionById.remove(mIdByConnection.get(connection)); String id = mIdByConnection.get(connection);
mIdByConnection.remove(connection); if (id != null) {
mAdapter.removeCall(id); mConnectionById.remove(id);
mIdByConnection.remove(connection);
mAdapter.removeCall(id);
}
} }
private String addConferenceInternal(Conference conference) { private String addConferenceInternal(Conference conference) {