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

Commit a06ecaf4 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Remove audio_hal_version_class flag" into main am: 97b4e56a 

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



Change-Id: I3430a4db4209c025c8adc2d20ea586abd2768ca4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5a575c3 97b4e56a

flags/hal.aconfig

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
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

}

system/audio_hal_interface/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ cc_library_static { 
        "libutils",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libbluetooth_log",

        "libbt-common",

        "libbt_shim_bridge",

system/audio_hal_interface/hal_version_manager.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {

system/audio_hal_interface/hidl/le_audio_software_hidl.cc

+2 −1
Original line number Diff line number Diff line
@@ -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;

}

system/test/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -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: [