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

Commit 31e6fe54 authored by Henri Chataing's avatar Henri Chataing
Browse files

Merge branch 'tm-qpr-dev' into tm-mainline-prod 

Bug: 256926565
Test: m
Change-Id: I30185436152f47c69804ac0b568eb04a2b35209c
parents 19f63ade e6727285

android/app/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ cc_library_shared { 
        "libbluetooth",

        "libc++fs",

    ],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

        "-Wno-unused-parameter",

    ],

    sanitize: {

        scs: true,

    },

system/audio_bluetooth_hw/Android.bp

+11 −10
Original line number Diff line number Diff line
@@ -9,8 +9,18 @@ package { 
    default_applicable_licenses: ["system_bt_license"],

}



cc_defaults {

    name: "audio_bluetooth_hw_defaults",

    defaults: ["fluoride_common_options"],

    cflags: [

        // suppress the warning in stream_apis.cc

        "-Wno-sign-compare",

    ],

}



cc_library_shared {

    name: "audio.bluetooth.default",

    defaults: ["audio_bluetooth_hw_defaults"],

    relative_install_path: "hw",

    proprietary: true,

    srcs: [
@@ -37,15 +47,11 @@ cc_library_shared { 
        "libbluetooth_audio_session",

        "libhidlbase",

    ],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-parameter",

    ],

}



cc_test {

    name: "audio_bluetooth_hw_test",

    defaults: ["audio_bluetooth_hw_defaults"],

    srcs: [

        "utils.cc",

        "utils_unittest.cc",
@@ -56,9 +62,4 @@ cc_test { 
        "liblog",

        "libutils",

    ],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-parameter",

    ],

}

system/blueberry/tests/gd/cert/py_hal.py

+6 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ class PyHal(Closable): 
        self.acl_stream = EventStream(self.device.hal.StreamAcl(empty_proto.Empty()))



        self.event_mask = 0x1FFF_FFFF_FFFF  # Default Event Mask (Core Vol 4 [E] 7.3.1)

        self.le_event_mask = 0x0000_0000_001F  # Default LE Event Mask (Core Vol 4 [E] 7.8.1)



        # We don't deal with SCO for now
@@ -173,6 +174,11 @@ class PyHal(Closable): 
            self.event_mask |= 1 << (int(event_code) - 1)

        self.send_hci_command(hci_packets.SetEventMaskBuilder(self.event_mask))



    def unmask_le_event(self, *subevent_codes):

        for subevent_code in subevent_codes:

            self.le_event_mask |= 1 << (int(subevent_code) - 1)

        self.send_hci_command(hci_packets.LeSetEventMaskBuilder(self.le_event_mask))



    def start_scanning(self):

        self.send_hci_command(

            hci_packets.LeSetExtendedScanEnableBuilder(hci_packets.Enable.ENABLED,

system/blueberry/tests/gd/hal/simple_hal_test.py

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ class SimpleHalTest(gd_base_test.GdBaseTestClass): 


    def test_le_ad_scan_cert_advertises(self):

        self.dut_hal.unmask_event(hci_packets.EventCode.LE_META_EVENT)

        self.dut_hal.unmask_le_event(hci_packets.SubeventCode.EXTENDED_ADVERTISING_REPORT)

        self.dut_hal.set_random_le_address('0D:05:04:03:02:01')



        self.dut_hal.set_scan_parameters()

system/btif/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -35,14 +35,11 @@ btifCommonIncludes = [ 


cc_library {

    name: "libstatslog_bt",

    defaults: ["fluoride_common_options"],

    host_supported: true,

    generated_sources: ["statslog_bt.cpp"],

    generated_headers: ["statslog_bt.h"],

    export_generated_headers: ["statslog_bt.h"],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    shared_libs: [

        "libcutils",

    ],