From e370b538ebb6ca1072f270aee3003faaa0d1deb2 Mon Sep 17 00:00:00 2001
From: Chenjie Luo <cjluo@google.com>
Date: Thu, 12 May 2016 16:59:43 -0700
Subject: [PATCH] Add null pointer check in removeConnection

Bug: 28607777
Change-Id: I199ed75740796540d243ad9f507ab2511c9ed3c1
---
 telecomm/java/android/telecom/ConnectionService.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index 9738a26b21a91..18da373768128 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -1187,12 +1187,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) {