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

Commit 082eca1b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Modified not to occur NPE when handle call of failed connection" am:... 

Merge "Modified not to occur NPE when handle call of failed connection" am: 4ebfefac am: 6073f108 am: fb6fb9e7

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

Change-Id: I303ee33e550e9806dc014f9f42b2fedec2f5f280
parents 7a93c417 fb6fb9e7

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

+4 −4
Original line number Diff line number Diff line
@@ -2091,11 +2091,11 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
            // failure to connect; we handle all failures uniformly

            Call foundCall = mCallIdMapper.getCall(callId);



            if (foundCall != null) {

                if (connection.getConnectTimeMillis() != 0) {

                    foundCall.setConnectTimeMillis(connection.getConnectTimeMillis());

                }



            if (foundCall != null) {

                // The post-dial digits are created when the call is first created.  Normally

                // the ConnectionService is responsible for stripping them from the address, but

                // since a failed connection will not have done this, we could end up with duplicate