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

Commit 2c2241a0 authored by Hall Liu's avatar Hall Liu Committed by Leslie Watkins
Browse files

Check for null call id in ConnectionServiceWrapper 

Abort the connection attempt if the call ID is null. See full analysis
in attached bug.

Fixes: 169827867
Test: lol
Change-Id: I53318d8000f1175935fa4b969a65c8b957f41391
parent 0e44b583

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

+8 −0
Original line number Diff line number Diff line
@@ -1269,6 +1269,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();