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

Commit d0d877e9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8548586 from 435c0da4 to tm-qpr1-release 

Change-Id: I307ebed697e1f8ef52e4f4836c3c2580824820b0
parents 5a3b382b 435c0da4

android/app/Android.bp

+0 −7
Original line number Diff line number Diff line
@@ -150,13 +150,6 @@ android_app { 
        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

        "android.hardware.bluetooth.audio-V1-ndk",

        "audio_set_configurations_bfbs",

        "audio_set_configurations_json",

        "audio_set_scenarios_bfbs",

        "audio_set_scenarios_json",

        "bt_did.conf",

        "bt_stack.conf",

        "privapp_allowlist_com.android.bluetooth.services.xml",

    ],

    apex_available: [

        "com.android.bluetooth",

android/app/src/com/android/bluetooth/btservice/ProfileService.java

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public abstract class ProfileService extends Service { 
                component,

                enable ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED

                       : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                PackageManager.DONT_KILL_APP);

                PackageManager.DONT_KILL_APP | PackageManager.SYNCHRONOUS);

    }



    /**

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ std::unordered_map<int32_t, uint8_t> frame_duration_map{ 
std::unordered_map<int32_t, uint16_t> octets_per_frame_map{

    {30, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen30},

    {40, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen40},

    {60, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen60},

    {120, ::le_audio::codec_spec_conf::kLeAudioCodecLC3FrameLen120}};



std::unordered_map<AudioLocation, uint32_t> audio_location_map{

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ class PyLeIso(Closable): 
                    bn_s_to_m=cc.bn_s_to_m,

                ))



        resp = self._device.iso.LeSetCigParameters(

        resp = self._device.iso.LeSetCigParametersTest(

            iso_facade_pb2.LeSetCigParametersTestRequest(

                cig_id=cig_id,

                sdu_interval_m_to_s=sdu_interval_m_to_s,

system/blueberry/tests/gd/iso/le_iso_test.py

+48 −87
Original line number Diff line number Diff line
@@ -90,13 +90,14 @@ class LeIsoTest(gd_base_test.GdBaseTestClass): 
        create_response = self.dut.hci_le_advertising_manager.CreateAdvertiser(request)

        self.cert_l2cap.connect_le_acl(self.dut_address)



    def _setup_cis_from_cert(self, cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, ft_m_to_s, ft_s_to_m, iso_interval,

    def _setup_cis_from_cert(self, cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, peripherals_clock_accuracy,

                             packing, framing, max_transport_latency_m_to_s, max_transport_latency_s_to_m, cis_id,

                             max_sdu_m_to_s, max_sdu_s_to_m, phy_m_to_s, phy_s_to_m, bn_m_to_s, bn_s_to_m):



        self.cert_iso.le_set_cig_parameters(cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m,

                                            peripherals_clock_accuracy, packing, framing, max_transport_latency_m_to_s,

                             max_transport_latency_s_to_m, cis_configs):

        self.cert_iso.le_set_cig_parameters_test(cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, ft_m_to_s, ft_s_to_m,

                                                 iso_interval, peripherals_clock_accuracy, packing, framing,

                                                 max_transport_latency_m_to_s, max_transport_latency_s_to_m,

                                                 cis_configs)

                                            max_transport_latency_s_to_m, cis_id, max_sdu_m_to_s, max_sdu_s_to_m,

                                            phy_m_to_s, phy_s_to_m, bn_m_to_s, bn_s_to_m)



        cis_handles = self.cert_iso.wait_le_set_cig_parameters_complete()
@@ -125,34 +126,24 @@ class LeIsoTest(gd_base_test.GdBaseTestClass): 
        cig_id = 0x01

        sdu_interval_m_to_s = 0

        sdu_interval_s_to_m = 0x186a

        ft_m_to_s = 0

        ft_s_to_m = 1

        iso_interval = 0x0A

        peripherals_clock_accuracy = 0

        packing = 0

        framing = 0

        max_transport_latency_m_to_s = 0

        max_transport_latency_s_to_m = 0

        cis_configs = [

            CisTestParameters(

                cis_id=0x01,

                nse=2,

                max_sdu_m_to_s=100,

                max_sdu_s_to_m=100,

                max_pdu_m_to_s=100,

                max_pdu_s_to_m=100,

                phy_m_to_s=0x02,

                phy_s_to_m=0x00,

                bn_m_to_s=0,

                bn_s_to_m=2,

            )

        ]

        cis_id = 0x01

        max_sdu_m_to_s = 100

        max_sdu_s_to_m = 100

        phy_m_to_s = 0x02

        phy_s_to_m = 0x00

        bn_m_to_s = 0

        bn_s_to_m = 2



        self._setup_link_from_cert()

        (dut_cis_stream, cert_cis_stream) = self._setup_cis_from_cert(

            cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, ft_m_to_s, ft_s_to_m, iso_interval,

            peripherals_clock_accuracy, packing, framing, max_transport_latency_m_to_s, max_transport_latency_s_to_m,

            cis_configs)

            cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, peripherals_clock_accuracy, packing, framing,

            max_transport_latency_m_to_s, max_transport_latency_s_to_m, cis_id, max_sdu_m_to_s, max_sdu_s_to_m,

            phy_m_to_s, phy_s_to_m, bn_m_to_s, bn_s_to_m)

        dut_cis_stream.send(b'abcdefgh' * 10)

        assertThat(cert_cis_stream).emits(IsoMatchers.Data(b'abcdefgh' * 10))
@@ -167,34 +158,24 @@ class LeIsoTest(gd_base_test.GdBaseTestClass): 
        cig_id = 0x01

        sdu_interval_m_to_s = 0x7530

        sdu_interval_s_to_m = 0x7530

        ft_m_to_s = 3

        ft_s_to_m = 2

        iso_interval = 0x18

        peripherals_clock_accuracy = 0

        packing = 0

        framing = 0

        max_transport_latency_m_to_s = 0

        max_transport_latency_s_to_m = 0

        cis_configs = [

            CisTestParameters(

                cis_id=0x01,

                nse=5,

                max_sdu_m_to_s=100,

                max_sdu_s_to_m=100,

                max_pdu_m_to_s=100,

                max_pdu_s_to_m=100,

                phy_m_to_s=0x02,

                phy_s_to_m=0x00,

                bn_m_to_s=3,

                bn_s_to_m=1,

            )

        ]

        cis_id = 0x01

        max_sdu_m_to_s = 100

        max_sdu_s_to_m = 100

        phy_m_to_s = 0x02

        phy_s_to_m = 0x00

        bn_m_to_s = 3

        bn_s_to_m = 1



        self._setup_link_from_cert()

        (dut_cis_stream, cert_cis_stream) = self._setup_cis_from_cert(

            cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, ft_m_to_s, ft_s_to_m, iso_interval,

            peripherals_clock_accuracy, packing, framing, max_transport_latency_m_to_s, max_transport_latency_s_to_m,

            cis_configs)

            cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, peripherals_clock_accuracy, packing, framing,

            max_transport_latency_m_to_s, max_transport_latency_s_to_m, cis_id, max_sdu_m_to_s, max_sdu_s_to_m,

            phy_m_to_s, phy_s_to_m, bn_m_to_s, bn_s_to_m)

        dut_cis_stream.send(b'abcdefgh' * 10)

        assertThat(cert_cis_stream).emits(IsoMatchers.Data(b'abcdefgh' * 10))
@@ -209,34 +190,24 @@ class LeIsoTest(gd_base_test.GdBaseTestClass): 
        cig_id = 0x01

        sdu_interval_m_to_s = 0x0000

        sdu_interval_s_to_m = 0x4e30

        ft_m_to_s = 0

        ft_s_to_m = 2

        iso_interval = 0x14

        peripherals_clock_accuracy = 0

        packing = 0

        framing = 1

        max_transport_latency_m_to_s = 0

        max_transport_latency_s_to_m = 0

        cis_configs = [

            CisTestParameters(

                cis_id=0x01,

                nse=4,

                max_sdu_m_to_s=100,

                max_sdu_s_to_m=100,

                max_pdu_m_to_s=100,

                max_pdu_s_to_m=100,

                phy_m_to_s=0x02,

                phy_s_to_m=0x00,

                bn_m_to_s=0,

                bn_s_to_m=2,

            )

        ]

        cis_id = 0x01

        max_sdu_m_to_s = 100

        max_sdu_s_to_m = 100

        phy_m_to_s = 0x02

        phy_s_to_m = 0x00

        bn_m_to_s = 0

        bn_s_to_m = 2



        self._setup_link_from_cert()

        (dut_cis_stream, cert_cis_stream) = self._setup_cis_from_cert(

            cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, ft_m_to_s, ft_s_to_m, iso_interval,

            peripherals_clock_accuracy, packing, framing, max_transport_latency_m_to_s, max_transport_latency_s_to_m,

            cis_configs)

            cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, peripherals_clock_accuracy, packing, framing,

            max_transport_latency_m_to_s, max_transport_latency_s_to_m, cis_id, max_sdu_m_to_s, max_sdu_s_to_m,

            phy_m_to_s, phy_s_to_m, bn_m_to_s, bn_s_to_m)

        dut_cis_stream.send(b'abcdefgh' * 10)

        assertThat(cert_cis_stream).emits(IsoMatchers.Data(b'abcdefgh' * 10))
@@ -251,34 +222,24 @@ class LeIsoTest(gd_base_test.GdBaseTestClass): 
        cig_id = 0x01

        sdu_interval_m_to_s = 0x14D5

        sdu_interval_s_to_m = 0x14D5

        ft_m_to_s = 1

        ft_s_to_m = 1

        iso_interval = 0x08

        peripherals_clock_accuracy = 0

        packing = 0

        framing = 1

        max_transport_latency_m_to_s = 0

        max_transport_latency_s_to_m = 0

        cis_configs = [

            CisTestParameters(

                cis_id=0x01,

                nse=2,

                max_sdu_m_to_s=100,

                max_sdu_s_to_m=100,

                max_pdu_m_to_s=100,

                max_pdu_s_to_m=100,

                phy_m_to_s=0x02,

                phy_s_to_m=0x00,

                bn_m_to_s=1,

                bn_s_to_m=1,

            )

        ]

        cis_id = 0x01

        max_sdu_m_to_s = 100

        max_sdu_s_to_m = 100

        phy_m_to_s = 0x02

        phy_s_to_m = 0x00

        bn_m_to_s = 1

        bn_s_to_m = 1



        self._setup_link_from_cert()

        (dut_cis_stream, cert_cis_stream) = self._setup_cis_from_cert(

            cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, ft_m_to_s, ft_s_to_m, iso_interval,

            peripherals_clock_accuracy, packing, framing, max_transport_latency_m_to_s, max_transport_latency_s_to_m,

            cis_configs)

            cig_id, sdu_interval_m_to_s, sdu_interval_s_to_m, peripherals_clock_accuracy, packing, framing,

            max_transport_latency_m_to_s, max_transport_latency_s_to_m, cis_id, max_sdu_m_to_s, max_sdu_s_to_m,

            phy_m_to_s, phy_s_to_m, bn_m_to_s, bn_s_to_m)

        dut_cis_stream.send(b'abcdefgh' * 10)

        assertThat(cert_cis_stream).emits(IsoMatchers.Data(b'abcdefgh' * 10))