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

Commit a7940177 authored by Jack He's avatar Jack He Committed by Gerrit Code Review
Browse files

Merge changes I4177000d,I7dd47643 into main 

* changes:
  Cert: Log L2CAP CID on connection success
  Cert: Use correct argument name
parents e976df30 d9be30e5

system/blueberry/tests/gd/l2cap/classic/cert_l2cap.py

+3 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ class CertL2cap(Closable, IHasBehaviors): 
                                   response.get().GetDestinationCid(), self._acl.acl_stream, self._acl,

                                   self.control_channel, fcs)

        self.scid_to_channel[scid] = channel

        logging.debug("Opened channel for PSM 0x{:X} SCID 0x{:X} DCID 0x{:X}".format(

            psm, scid,

            response.get().GetDestinationCid()))

        while not self.pending_configuration_requests.empty():

            l2cap_control_view = self.pending_configuration_requests.get_nowait()

            logging.info("Handling deferred configuration requests")

system/blueberry/tests/gd/security/cert_security.py

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ class CertSecurity(PySecurity): 
        self._enqueue_hci_command(

            hci.SendKeypressNotification(bd_addr=peer, notification_type=hci.KeypressNotificationType.ENTRY_COMPLETED),

            True)

        self._enqueue_hci_command(hci.UserPasskeyRequestReply(bd_addr=peer, numerical_value=passkey), True)

        self._enqueue_hci_command(hci.UserPasskeyRequestReply(bd_addr=peer, numeric_value=passkey), True)



    def input_pin(self, address, pin):

        """