Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 610084b4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Check for null call id in ConnectionServiceWrapper" am: 9ee28de2 am: 198be8e2 am: 2f8679a3

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

Change-Id: I6a1305da54941668353d9b992caaa15c19ea2383
parents dbe88f6f 2f8679a3

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

+8 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,14 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
            @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();