commit 2f8679a36c5d9b82869fc74d34007d6d44a9588c
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 26 20:26:10 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 26 20:26:10 2021 +0000
tree 4b98d1a6218a2921e12542aeb27abfbdf21385d7
parent 77a3cc61b5e61d4e2a670a048f7f97189ae48698
parent 198be8e2b7ae43a0c388c4441813bcabbd79f68e

Merge "Check for null call id in ConnectionServiceWrapper" am: 9ee28de248 am: 198be8e2b7

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1681992

Change-Id: Ifd2a95cf8faf09c3423a710fff351af78c7327e0

src/com/android/server/telecom/ConnectionServiceWrapper.java

diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index 1cb3957..1fc9a3b 100755
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -1269,6 +1269,14 @@
             @Override
             public void onSuccess() {
                 String callId = mCallIdMapper.getCallId(call);
+                if (callId == null) {
+                    Log.w(ConnectionServiceWrapper.this, "Call not present"
+                            + " in call id mapper, maybe it was aborted before the bind"
+                            + " completed successfully?");
+                    response.handleCreateConnectionFailure(
+                            new DisconnectCause(DisconnectCause.CANCELED));
+                    return;
+                }
                 mPendingResponses.put(callId, response);
 
                 GatewayInfo gatewayInfo = call.getGatewayInfo();