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

Commit 1f717da8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I98936789,Iea07e258 am: e0bcc867 

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



Change-Id: Ida4f4c6b8506d21a0042274959ed800e1696a1b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df3364b5 e0bcc867

system/blueberry/tests/sl4a_sl4a/lib/security.py

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class Security: 
                logging.error("Failed to generate OOB data!")

                # Check if generating oob data failed without blocking

                try:

                    generate_failure_event = self.__device.ed.pop_event(self.SL4A_EVENT_GENERATE_OOB_DATA_FAILURE, 0)

                    generate_failure_event = self.__device.ed.pop_event(self.SL4A_EVENT_GENERATE_OOB_DATA_ERROR, 0)

                except queue.Empty as error:

                    logging.error("Failed to generate OOB Data without error code")

                    assertThat(True).isFalse()

system/blueberry/tests/sl4a_sl4a/security/oob_pairing_test.py

+4 −2
Original line number Diff line number Diff line
@@ -100,9 +100,11 @@ class OobPairingTest(sl4a_sl4a_base_test.Sl4aSl4aBaseTestClass): 


    def test_le_generate_local_oob_data(self):

        oob_data = self.dut_security_.generate_oob_data(Security.TRANSPORT_LE)

        assertThat(oob_data).isNotNone()

        assertThat(oob_data[0]).isEqualTo(0)

        assertThat(oob_data[1]).isNotNone()

        oob_data = self.cert_security_.generate_oob_data(Security.TRANSPORT_LE)

        assertThat(oob_data).isNotNone()

        assertThat(oob_data[0]).isEqualTo(0)

        assertThat(oob_data[1]).isNotNone()



    def test_le_generate_local_oob_data_stress(self):

        for i in range(1, 20):