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

Commit 7945f982 authored by Qing Zhong's avatar Qing Zhong Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE when device has no UI InCallService" into main

parents ee9fbfb8 55cac47e

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

+2 −1
Original line number Diff line number Diff line
@@ -1932,7 +1932,8 @@ public class InCallController extends CallsManagerListenerBase implements 


        // Actually try binding to the UI InCallService.

        if (inCallServiceConnection.connect(call) ==

                InCallServiceConnection.CONNECTION_SUCCEEDED || call.isSelfManaged()) {

                InCallServiceConnection.CONNECTION_SUCCEEDED || (call != null

                && call.isSelfManaged())) {

            // Only connect to the non-ui InCallServices if we actually connected to the main UI

            // one, or if the call is self-managed (in which case we'd still want to keep Wear, BT,

            // etc. informed.