commit 9ee28de248942bfed66e18b9fcb02b9a90f71af4
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 26 19:36:57 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 26 19:36:57 2021 +0000
tree c595582def79c4cc4504dfbead36e6ab52b2281e
parent 60887bbfa3d815b2177c097d71bc2f6a5b5109ae
parent 2c2241a05fbbf73c8535a92cef5cbafea2c83901

Merge "Check for null call id in ConnectionServiceWrapper"

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