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

Commit 6073f108 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: 4ebfefac 

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

Change-Id: I7babce56bfc098aa7f3f2ffcc241754cbf1db6cb
parents 099a2082 4ebfefac

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