diff --git a/flags/hal.aconfig b/flags/hal.aconfig
deleted file mode 100644
index ebcf64390ff1461b786c6c53bb893da258f434b6..0000000000000000000000000000000000000000
--- a/flags/hal.aconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-package: "com.android.bluetooth.flags"
-container: "com.android.btservices"
-
-flag {
- name: "audio_hal_version_class"
- namespace: "bluetooth"
- description: "Change bluetooth audio hal version from enum to class"
- bug: "315983648"
- is_fixed_read_only: true
-}
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index fa629d383102a24effc99bcb161663f6e33eeb1d..323dc1644c3d255c404b81f3e37802d3b4238d96 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -25,7 +25,6 @@ cc_library_static {
"libutils",
],
static_libs: [
- "bluetooth_flags_c_lib",
"libbluetooth_log",
"libbt-common",
"libbt_shim_bridge",
diff --git a/system/audio_hal_interface/hal_version_manager.h b/system/audio_hal_interface/hal_version_manager.h
index 81cd882630251c3a89e5dc562325e8ff70ab4375..8743219025b01937b256e5200670c853d953a59b 100644
--- a/system/audio_hal_interface/hal_version_manager.h
+++ b/system/audio_hal_interface/hal_version_manager.h
@@ -18,7 +18,6 @@
#include <android/hardware/bluetooth/audio/2.1/IBluetoothAudioProvidersFactory.h>
#include <android/hardware/bluetooth/audio/2.1/types.h>
-#include <com_android_bluetooth_flags.h>
namespace bluetooth {
namespace audio {
diff --git a/system/audio_hal_interface/hidl/le_audio_software_hidl.cc b/system/audio_hal_interface/hidl/le_audio_software_hidl.cc
index 1cf3e251402642d2eb81d8886bcf30bb16e1a8ee..8362dc5edde186e3a9b67a8cb6720eff676ba13b 100644
--- a/system/audio_hal_interface/hidl/le_audio_software_hidl.cc
+++ b/system/audio_hal_interface/hidl/le_audio_software_hidl.cc
@@ -265,7 +265,8 @@ bool LeAudioTransport::IsRequestCompletedAfterUpdate(
auto ret = std::get<1>(result);
LOG_VERBOSE("new state: %d, return: %s",
- static_cast<int>(start_request_state_.load()), ret);
+ static_cast<int>(start_request_state_.load()),
+ ret ? "true" : "false");
return ret;
}
diff --git a/system/test/Android.bp b/system/test/Android.bp
index 3116df2bf3fb5c9da35ad0eb8af401cda84de5d2..95836dada5fa27808ecd6b6d96535dc33981708e 100644
--- a/system/test/Android.bp
+++ b/system/test/Android.bp
@@ -628,9 +628,7 @@ cc_test {
"android.hardware.bluetooth.audio@2.1",
"android.hardware.common-V2-ndk",
"android.hardware.common.fmq-V1-ndk",
- "bluetooth_flags_c_lib",
"libbt-audio-hal-interface",
- "libflagtest",
],
test_suites: ["general-tests"],
cflags: [
diff --git a/system/test/common/hal_version_manager_test.cc b/system/test/common/hal_version_manager_test.cc
index ed6c41a634cec07984551dabd20b066d5d4fe42e..936ca8e3f788a933d3eea77fe698c3c89134e34c 100644
--- a/system/test/common/hal_version_manager_test.cc
+++ b/system/test/common/hal_version_manager_test.cc
@@ -16,12 +16,8 @@
#include "audio_hal_interface/hal_version_manager.h"
-#include <flag_macros.h>
#include <gtest/gtest.h>
-#include <cstdint>
-#include <string>
-
using bluetooth::audio::BluetoothAudioHalTransport;
using bluetooth::audio::BluetoothAudioHalVersion;
using bluetooth::audio::HalVersionManager;
@@ -147,10 +143,7 @@ TEST_F(BluetoothAudioHalVersionTest, versionOperatorGreaterOrEqual) {
BluetoothAudioHalVersion::VERSION_AIDL_V4);
}
-TEST_F_WITH_FLAGS(
- BluetoothAudioHalVersionTest, HIDL_VERSION_2_0,
- REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(com::android::bluetooth::flags,
- audio_hal_version_class))) {
+TEST_F(BluetoothAudioHalVersionTest, HIDL_VERSION_2_0) {
EXPECT_EQ(BluetoothAudioHalVersion::VERSION_2_0,
BluetoothAudioHalVersion(BluetoothAudioHalTransport::HIDL, 2, 0));
@@ -167,10 +160,7 @@ TEST_F_WITH_FLAGS(
"minor: 0") != std::string::npos);
}
-TEST_F_WITH_FLAGS(
- BluetoothAudioHalVersionTest, HIDL_VERSION_2_1,
- REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(com::android::bluetooth::flags,
- audio_hal_version_class))) {
+TEST_F(BluetoothAudioHalVersionTest, HIDL_VERSION_2_1) {
EXPECT_EQ(BluetoothAudioHalVersion::VERSION_2_1,
BluetoothAudioHalVersion(BluetoothAudioHalTransport::HIDL, 2, 1));
@@ -187,10 +177,7 @@ TEST_F_WITH_FLAGS(
"minor: 1") != std::string::npos);
}
-TEST_F_WITH_FLAGS(
- BluetoothAudioHalVersionTest, AIDL_VERSIONS_V1,
- REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(com::android::bluetooth::flags,
- audio_hal_version_class))) {
+TEST_F(BluetoothAudioHalVersionTest, AIDL_VERSIONS_V1) {
EXPECT_EQ(BluetoothAudioHalVersion::VERSION_AIDL_V1,
BluetoothAudioHalVersion(BluetoothAudioHalTransport::AIDL, 1, 0));
@@ -207,7 +194,7 @@ TEST_F_WITH_FLAGS(
"minor: 0") != std::string::npos);
}
-TEST_F_WITH_FLAGS(BluetoothAudioHalVersionTest, AIDL_VERSIONS_V2) {
+TEST_F(BluetoothAudioHalVersionTest, AIDL_VERSIONS_V2) {
EXPECT_EQ(BluetoothAudioHalVersion::VERSION_AIDL_V2,
BluetoothAudioHalVersion(BluetoothAudioHalTransport::AIDL, 2, 0));
@@ -224,10 +211,7 @@ TEST_F_WITH_FLAGS(BluetoothAudioHalVersionTest, AIDL_VERSIONS_V2) {
"minor: 0") != std::string::npos);
}
-TEST_F_WITH_FLAGS(
- BluetoothAudioHalVersionTest, AIDL_VERSIONS_V3,
- REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(com::android::bluetooth::flags,
- audio_hal_version_class))) {
+TEST_F(BluetoothAudioHalVersionTest, AIDL_VERSIONS_V3) {
EXPECT_EQ(BluetoothAudioHalVersion::VERSION_AIDL_V3,
BluetoothAudioHalVersion(BluetoothAudioHalTransport::AIDL, 3, 0));
@@ -244,10 +228,7 @@ TEST_F_WITH_FLAGS(
"minor: 0") != std::string::npos);
}
-TEST_F_WITH_FLAGS(
- BluetoothAudioHalVersionTest, AIDL_VERSIONS_V4,
- REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(com::android::bluetooth::flags,
- audio_hal_version_class))) {
+TEST_F(BluetoothAudioHalVersionTest, AIDL_VERSIONS_V4) {
EXPECT_EQ(BluetoothAudioHalVersion::VERSION_AIDL_V4,
BluetoothAudioHalVersion(BluetoothAudioHalTransport::AIDL, 4, 0));
@@ -268,10 +249,7 @@ TEST_F_WITH_FLAGS(
* An example of future AIDL version (next one will be V5), we check that next
* AIDL version will be larger than existing AIDL versions
*/
-TEST_F_WITH_FLAGS(
- BluetoothAudioHalVersionTest, AIDL_VERSIONS_Vx,
- REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(com::android::bluetooth::flags,
- audio_hal_version_class))) {
+TEST_F(BluetoothAudioHalVersionTest, AIDL_VERSIONS_Vx) {
EXPECT_TRUE(BluetoothAudioHalVersion(BluetoothAudioHalTransport::AIDL, 5, 0) >
BluetoothAudioHalVersion::VERSION_AIDL_V4);
EXPECT_FALSE(BluetoothAudioHalVersion(BluetoothAudioHalTransport::AIDL, 5, 0)