commit 40afe69d38ea5878d5b82cbf2a8b105f61df2e52
author lijilou <lijilou@xiaomi.corp-partner.google.com> Sat Jun 01 21:07:01 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 01 21:07:01 2024 +0000
tree f81d6f60b65b6f4e68745eb46e565ae679b0a39a
parent eb569f08d9829c0b98a5d353da31654a0ab4816b
parent 974805640bace91c543f2e06e1392a6e2a02e789

Telecom:fix NPE problem to avoid telecom process crash. am: baccd54acb am: 974805640b

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

Change-Id: I630a909af9b19bf4f09c0db88a6e26b1b1ab3311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index de53a3d..feb9ee6 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -499,8 +499,12 @@
                 @Override
                 public void releaseConnectionService(
                         ConnectionServiceFocusManager.ConnectionServiceFocus connectionService) {
+                    if (connectionService == null) {
+                        Log.i(this, "releaseConnectionService: connectionService is null");
+                        return;
+                    }
                     mCalls.stream()
-                            .filter(c -> c.getConnectionServiceWrapper().equals(connectionService))
+                            .filter(c -> connectionService.equals(c.getConnectionServiceWrapper()))
                             .forEach(c -> c.disconnect("release " +
                                     connectionService.getComponentName().getPackageName()));
                 }