| commit | 082eca1b8cda3a9d6ab40525dda8565d3571ba95 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 12 01:39:14 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 12 01:39:14 2022 +0000 |
| tree | 91fc753604e9cb7b87324502ad80652c6eb1520c | |
| parent | 7a93c417c8e03ad8a9e8251d99e23e9768248c6e [diff] | |
| parent | fb6fb9e7542e37148bedba6e05620dc5b637c054 [diff] |
Merge "Modified not to occur NPE when handle call of failed connection" am: 4ebfefaca5 am: 6073f10824 am: fb6fb9e754 Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1598713 Change-Id: I303ee33e550e9806dc014f9f42b2fedec2f5f280
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