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

Commit 9dcb5617 authored by Wang Fei's avatar Wang Fei
Browse files

Use logic operator to caculate the logical result 

We should use the logic operator && to caculate the
logcical result to avoid potential problem.

Test: Restart bluetooth and watch if it running OK

Change-Id: I64ce6648ec3512e2ee2984618f5fe8a95e2534b7
parent 2372e559

system/gd/security/pairing_handler_le.h

+6 −3
Original line number Diff line number Diff line
@@ -318,7 +318,8 @@ class PairingHandlerLe { 


  std::optional<PairingEvent> WaitUiPairingAccept() {

    PairingEvent e = WaitForEvent();

    if (e.type == PairingEvent::UI & e.ui_action == PairingEvent::PAIRING_ACCEPTED) {

    if (e.type == PairingEvent::UI &&

        e.ui_action == PairingEvent::PAIRING_ACCEPTED) {

      return e;

    } else {

      return std::nullopt;
@@ -327,7 +328,8 @@ class PairingHandlerLe { 


  std::optional<PairingEvent> WaitUiConfirmYesNo() {

    PairingEvent e = WaitForEvent();

    if (e.type == PairingEvent::UI & e.ui_action == PairingEvent::CONFIRM_YESNO) {

    if (e.type == PairingEvent::UI &&

        e.ui_action == PairingEvent::CONFIRM_YESNO) {

      return e;

    } else {

      return std::nullopt;
@@ -362,7 +364,8 @@ class PairingHandlerLe { 
      e = WaitForEvent();

    }



    if (e.type == PairingEvent::UI & e.ui_action == PairingEvent::PASSKEY) {

    if (e.type == PairingEvent::UI &&

        e.ui_action == PairingEvent::PASSKEY) {

      return e;

    } else {

      return std::nullopt;