commit 58642e65455ee9456993a2f6386402fbcec68ab8
author Chenjie Luo <cjluo@google.com> Wed May 18 20:29:17 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 18 20:29:17 2016 +0000
tree df55fe4bb479831e389c980ded9445a5c514ff50
parent e7e49b48b295b4f81ad8a9f5c1d9f16370b06437
parent e370b538ebb6ca1072f270aee3003faaa0d1deb2

Add null pointer check in removeConnection
am: e370b538eb

* commit 'e370b538ebb6ca1072f270aee3003faaa0d1deb2':
  Add null pointer check in removeConnection

Change-Id: I7b615a8f7c7a89617c4f748ad74007ec73db6784

telecomm/java/android/telecom/ConnectionService.java

diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index dfe2396..8391043 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -1193,12 +1193,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) {