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

Commit 5abc112a authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Correct issue in unflagged code path for separatelyBindToBtIncallService. 

The flag check was missing here; as a consequence, when the flag was off,
the BT ICS would get set to type `IN_CALL_SERVICE_TYPE_BLUETOOTH` and
would then be ignored in all the other bind/rebind logic.

Fixes: 323567772
Test: Manual testing for BT behavior.
Test: Re-run unit tests.
Change-Id: I249a1ba5bb1544c61af914c50d60172a0fffb416
parent 0fb5e97e

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;

        }