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

Add null pointer check in removeConnection am: e370b538eb am: 58642e6545

Browse Source 
am: 7e745ec49c

* commit '7e745ec49c0458f92af65bf370770417dcc7075d':
  Add null pointer check in removeConnection

Change-Id: Iba29d78be4b3cae05144e6c0b68cce5357114ddd
This commit is contained in:
Chenjie Luo
2016-05-18 20:41:10 +00:00
committed by android-build-merger
parent c4a41245a9 7e745ec49c
commit 8462d63c23
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1367,13 +1367,15 @@ 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);
if (id != null) {
mConnectionById.remove(id);
mIdByConnection.remove(connection); mIdByConnection.remove(connection);
mAdapter.removeCall(id); mAdapter.removeCall(id);
} }
}
private String addConferenceInternal(Conference conference) { private String addConferenceInternal(Conference conference) {
if (mIdByConference.containsKey(conference)) { if (mIdByConference.containsKey(conference)) {