commit 8462d63c238117bd6f9dea3c073b5996564621b1
author Chenjie Luo <cjluo@google.com> Wed May 18 20:41:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 18 20:41:10 2016 +0000
tree 8c47c9a43ddb518b2ed8afa65872a41f60545d93
parent c4a41245a9ef1cef8f26a58e9f119b44486490a1
parent 7e745ec49c0458f92af65bf370770417dcc7075d

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

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

Change-Id: Iba29d78be4b3cae05144e6c0b68cce5357114ddd

telecomm/java/android/telecom/ConnectionService.java

diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index 4cab7f0..fc7d741 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -1367,12 +1367,14 @@
 
     /** {@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) {