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

Commit 3a2dba79 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

gd::l2cap: Replace InvokeIfNotEmpty with Invoke am: 658eae8f am: 9643137a 

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



Change-Id: Id621ab69dd1eff2a686ac1198ba0102638327aae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2dadca2 9643137a

system/gd/l2cap/classic/security_enforcement_interface.h

+2 −2
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ class SecurityEnforcementRejectAllImpl : public SecurityEnforcementInterface { 
      SecurityPolicy policy,

      ResultCallback result_callback) override {

    if (policy == SecurityPolicy::_SDP_ONLY_NO_SECURITY_WHATSOEVER_PLAINTEXT_TRANSPORT_OK) {

      result_callback.InvokeIfNotEmpty(true);

      result_callback.Invoke(true);

    } else {

      result_callback.InvokeIfNotEmpty(false);

      result_callback.Invoke(false);

    }

  }

};

system/gd/l2cap/internal/dynamic_channel_impl.cc

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void DynamicChannelImpl::OnClosed(hci::ErrorCode status) { 
  close_reason_ = status;

  link_ = nullptr;

  l2cap_handler_ = nullptr;

  on_close_callback_.InvokeIfNotEmpty(close_reason_);

  on_close_callback_.Invoke(close_reason_);

  on_close_callback_ = {};

}

system/gd/l2cap/le/l2cap_le_module.cc

+2 −2
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ class SecurityEnforcementRejectAllImpl : public SecurityEnforcementInterface { 
      SecurityPolicy policy,

      ResultCallback result_callback) override {

    if (policy == SecurityPolicy::NO_SECURITY_WHATSOEVER_PLAINTEXT_TRANSPORT_OK) {

      result_callback.InvokeIfNotEmpty(true);

      result_callback.Invoke(true);

    } else {

      result_callback.InvokeIfNotEmpty(false);

      result_callback.Invoke(false);

    }

  }

};