| commit | f30dcf8b00b7686a6d295988fe9fcd79a1f27c02 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Mar 13 20:51:39 2024 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Mar 29 18:54:27 2024 +0000 |
| tree | 0a0f71abc78a755798b6424e82f64b0290cb4391 | |
| parent | c82e07a0cc5be779827cb6ab79014993c5f75d0e [diff] |
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. (cherry picked from commit 5abc112a32f118f40308c39ea9b534e3401020ab) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b0624fb1fba00e7799e1f013d02dbfceb0919f71) Merged-In: I249a1ba5bb1544c61af914c50d60172a0fffb416 Change-Id: I249a1ba5bb1544c61af914c50d60172a0fffb416
diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java index 0ec3209..f464d04 100644 --- a/src/com/android/server/telecom/InCallController.java +++ b/src/com/android/server/telecom/InCallController.java
@@ -2427,7 +2427,9 @@ } 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; }