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

Commit 97480564 authored by lijilou's avatar lijilou Committed by Automerger Merge Worker
Browse files

Telecom:fix NPE problem to avoid telecom process crash. am: baccd54a 

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



Change-Id: I0ad4b223a3efd54397b75a7b8d8c13146d41a42a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef242089 baccd54a

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

+5 −1
Original line number Diff line number Diff line
@@ -498,8 +498,12 @@ public class CallsManager extends Call.ListenerBase 
                @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()));

                }