Merge "Add broadcast feature flag for cts" into main (c71e40ae) · Commits · e / os / android_packages_modules_Bluetooth

flags/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ java_aconfig_library {
		visibility: [
		"//cts/tests/tests/bluetooth:__subpackages__",
		"//packages/modules/Bluetooth/android/app",
		"//packages/modules/Bluetooth/framework/tests/util",
		"//packages/modules/Bluetooth/service:__subpackages__",
		],
		apex_available: [

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ java_library {
		static_libs: [
		"PlatformProperties",
		"androidx.test.ext.truth",
		"bluetooth_flags_java_lib",
		"compatibility-device-util-axt",
		"junit",
		],

+5 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.bluetooth.cts;

		import static com.android.bluetooth.flags.Flags.leaudioBroadcastFeatureSupport;
		import static com.google.common.truth.Truth.assertThat;

		import android.bluetooth.BluetoothAdapter;
		@@ -95,10 +96,12 @@ public class TestUtils extends android.bluetooth.test_utils.TestUtils {
		return BluetoothProperties.isProfileBapUnicastClientEnabled().orElse(false);
		}
		case BluetoothProfile.LE_AUDIO_BROADCAST -> {
		return BluetoothProperties.isProfileBapBroadcastSourceEnabled().orElse(false);
		return leaudioBroadcastFeatureSupport()
		&& BluetoothProperties.isProfileBapBroadcastSourceEnabled().orElse(false);
		}
		case BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT -> {
		return BluetoothProperties.isProfileBapBroadcastAssistEnabled().orElse(false);
		return leaudioBroadcastFeatureSupport()
		&& BluetoothProperties.isProfileBapBroadcastAssistEnabled().orElse(false);
		}
		// Hidden profile
		// case BluetoothProfile.LE_CALL_CONTROL: