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

Commit 438a1861 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 am: 1eee5fa9 

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



Change-Id: Id55e7bc275c514d620f662908a230dca7aab41b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04e07d6e 1eee5fa9

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

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

package android.bluetooth.cts;





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

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 static com.google.common.truth.Truth.assertThat;





import android.bluetooth.BluetoothAdapter;

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

                return BluetoothProperties.isProfileBapUnicastClientEnabled().orElse(false);

            }

            }

            case BluetoothProfile.LE_AUDIO_BROADCAST -> {

            case BluetoothProfile.LE_AUDIO_BROADCAST -> {

                return leaudioBroadcastFeatureSupport()

                return isAtLeastV()

                        && leaudioBroadcastFeatureSupport()

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

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

            }

            }

            case BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT -> {

            case BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT -> {

                return leaudioBroadcastFeatureSupport()

                return isAtLeastV()

                        && leaudioBroadcastFeatureSupport()

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

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

            }

            }

                // Hidden profile

                // Hidden profile