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

Commit 1eee5fa9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent checking flag in CTS for device before V" into main am: 08ffdf81 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2941165



Change-Id: I13a852c453cb32b60d97e4ebfc01a450a9370476
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf6891e4 08ffdf81

framework/tests/util/src/android/bluetooth/cts/TestUtils.java

+6 −2
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package android.bluetooth.cts;



import static com.android.bluetooth.flags.Flags.leaudioBroadcastFeatureSupport;

import static com.android.modules.utils.build.SdkLevel.isAtLeastV;



import static com.google.common.truth.Truth.assertThat;



import android.bluetooth.BluetoothAdapter;
@@ -96,11 +98,13 @@ public class TestUtils extends android.bluetooth.test_utils.TestUtils { 
                return BluetoothProperties.isProfileBapUnicastClientEnabled().orElse(false);

            }

            case BluetoothProfile.LE_AUDIO_BROADCAST -> {

                return leaudioBroadcastFeatureSupport()

                return isAtLeastV()

                        && leaudioBroadcastFeatureSupport()

                        && BluetoothProperties.isProfileBapBroadcastSourceEnabled().orElse(false);

            }

            case BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT -> {

                return leaudioBroadcastFeatureSupport()

                return isAtLeastV()

                        && leaudioBroadcastFeatureSupport()

                        && BluetoothProperties.isProfileBapBroadcastAssistEnabled().orElse(false);

            }

                // Hidden profile