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 am: 7e745ec49c

Browse Source 
am: 8462d63c23

* commit '8462d63c238117bd6f9dea3c073b5996564621b1':
  Add null pointer check in removeConnection

Change-Id: I820fe9de2186784261b7c8dd838fa1ebcf1bab6a
This commit is contained in:
Chenjie Luo
2016-05-18 20:46:16 +00:00
committed by android-build-merger
parent 34306764b4 8462d63c23
commit 9aea3f1b94
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

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