commit fb6fb9e7542e37148bedba6e05620dc5b637c054
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 12 01:22:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 12 01:22:46 2022 +0000
tree 86add1d948df46d8687785b7afa63b12375f8a05
parent 72004d0d95777465c1fe63eaaf53ddc504f8abc8
parent 6073f10824508b7ad4e57136fc42906adff185c5

Merge "Modified not to occur NPE when handle call of failed connection" am: 4ebfefaca5 am: 6073f10824

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

Change-Id: I0771a610c414941087f0ca3f9f141cc359254fbc

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 4018d54..3a4d143 100755
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -2091,11 +2091,11 @@
             // failure to connect; we handle all failures uniformly
             Call foundCall = mCallIdMapper.getCall(callId);
 
-            if (connection.getConnectTimeMillis() != 0) {
-                foundCall.setConnectTimeMillis(connection.getConnectTimeMillis());
-            }
-
             if (foundCall != null) {
+                if (connection.getConnectTimeMillis() != 0) {
+                    foundCall.setConnectTimeMillis(connection.getConnectTimeMillis());
+                }
+
                 // 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