commit 610084b4fe98884abeb6778d7fe52e1718b9c6c3
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 26 20:51:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 26 20:51:34 2021 +0000
tree 39a927f12a2df5971f72d5b15fb64de4e54821ef
parent dbe88f6f045a89403cc568a2f029abdcb1da93d4
parent 2f8679a36c5d9b82869fc74d34007d6d44a9588c

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

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

Change-Id: I6a1305da54941668353d9b992caaa15c19ea2383

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 316a04d..433bc7f 100755
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -1271,6 +1271,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();