commit 198be8e2b7ae43a0c388c4441813bcabbd79f68e
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 26 20:02:43 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 26 20:02:43 2021 +0000
tree cbd616badc4e62cd789c976317f84ba419c2a6ae
parent 6de42d79305e5712f04ba755f1f5304a754148b6
parent 9ee28de248942bfed66e18b9fcb02b9a90f71af4

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

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

Change-Id: I117b2d71e590ddeb8f060ff92ef11087aac23035

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();