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

Commit 6a3009be authored by Yuyang Huang's avatar Yuyang Huang Committed by Gerrit Code Review
Browse files

Merge "Use DSP's LC3 codec setting when BT controller does not support LC3" into main

parents 86de377a 042c180e
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -20,3 +20,10 @@ flag {
    description: "AptX Voice codec support for HFP calls"
    bug: "308497929"
}

flag {
    name: "use_dsp_codec_when_controller_does_not_support"
    namespace: "bluetooth"
    description: "use codec on the DSP when the BT controller does not support it"
    bug: "308838380"
}
+2 −0
Original line number Diff line number Diff line
@@ -264,8 +264,10 @@ cc_test {
        "libcrypto",
        "libcutils",
        "liblog",
        "server_configurable_flags",
    ],
    static_libs: [
        "bluetooth_flags_c_lib",
        "libbase",
        "libbluetooth-types",
        "libbluetooth_crypto_toolbox",
+4 −0
Original line number Diff line number Diff line
@@ -622,10 +622,12 @@ cc_test {
        "libhidlbase",
        "liblog",
        "libutils",
        "server_configurable_flags",
    ],
    static_libs: [
        "android.hardware.bluetooth.a2dp@1.0",
        "avrcp-target-service",
        "bluetooth_flags_c_lib",
        "lib-bt-packets",
        "lib-bt-packets-avrcp",
        "lib-bt-packets-base",
@@ -766,10 +768,12 @@ cc_test {
        "libhidlbase",
        "liblog",
        "libutils",
        "server_configurable_flags",
    ],
    static_libs: [
        "android.hardware.bluetooth.a2dp@1.0",
        "avrcp-target-service",
        "bluetooth_flags_c_lib",
        "lib-bt-packets",
        "lib-bt-packets-avrcp",
        "lib-bt-packets-base",
+10 −1
Original line number Diff line number Diff line
@@ -31,9 +31,18 @@ cc_library_static {
    apex_available: [
        "com.android.btservices",
    ],
    generated_headers: [
        "BluetoothGeneratedDumpsysDataSchema_h",
    ],
    min_sdk_version: "Tiramisu",
    header_libs: ["libbluetooth_headers"],
    static_libs: ["libbt_shim_bridge"],
    static_libs: [
        "bluetooth_flags_c_lib",
        "libbluetooth_hci_pdl",
        "libbt_shim_bridge",
        "libflatbuffers-cpp",
        "server_configurable_flags",
    ],
}

// Bluetooth device unit tests for target
+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ static_library("device") {
  deps = [
    "//bt/system/gd/rust/shim:init_flags_bridge_header",
    "//bt/system/gd/rust/shim:libbluetooth_rust_interop",
    "//bt/system/pdl:BluetoothGeneratedPackets_h",
  ]
}

Loading