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

Commit 9c354124 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Correct issue in unflagged code path for separatelyBindToBtIncallService." into 24D1-dev

parents 1c795037 52206d28

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

+3 −1
Original line number Diff line number Diff line
@@ -2427,7 +2427,9 @@ public class InCallController extends CallsManagerListenerBase implements 
        }



        String bluetoothPackage = mDefaultDialerCache.getBTInCallServicePackage();

        if (serviceInfo.packageName != null && serviceInfo.packageName.equals(bluetoothPackage)

        if (mFeatureFlags.separatelyBindToBtIncallService()

                && serviceInfo.packageName != null

                && serviceInfo.packageName.equals(bluetoothPackage)

                && (hasControlInCallPermission || hasAppOpsPermittedManageOngoingCalls)) {

            return IN_CALL_SERVICE_TYPE_BLUETOOTH;

        }