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

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

[16/24] Canonical form tBTM_STATUS::BTM_MODE4_LEVEL4_NOT_SUPPORTED am: 02f7ac35 

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



Change-Id: I38dd8c9448fbc7d01594359c637e78e2eee046af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70c91304 02f7ac35

system/stack/btm/btm_sec.cc

+6 −5
Original line number Diff line number Diff line
@@ -1453,10 +1453,10 @@ tBTM_STATUS btm_sec_l2cap_access_req_by_requirement(const RawAddress& bd_addr, 
              "rmt_support_for_sc={}, failing connection",

              local_supports_sc, p_dev_rec->SupportsSecureConnections());

      if (p_callback) {

        (*p_callback)(bd_addr, transport, (void*)p_ref_data, BTM_MODE4_LEVEL4_NOT_SUPPORTED);

        (*p_callback)(bd_addr, transport, (void*)p_ref_data,

                      tBTM_STATUS::BTM_MODE4_LEVEL4_NOT_SUPPORTED);

      }



      return BTM_MODE4_LEVEL4_NOT_SUPPORTED;

      return tBTM_STATUS::BTM_MODE4_LEVEL4_NOT_SUPPORTED;

    }

  }
@@ -1778,10 +1778,11 @@ tBTM_STATUS btm_sec_mx_access_request(const RawAddress& bd_addr, bool is_origina 
              "remote_SC_support:{}",

              local_supports_sc, p_dev_rec->SupportsSecureConnections());

      if (p_callback) {

        (*p_callback)(bd_addr, transport, (void*)p_ref_data, BTM_MODE4_LEVEL4_NOT_SUPPORTED);

        (*p_callback)(bd_addr, transport, (void*)p_ref_data,

                      tBTM_STATUS::BTM_MODE4_LEVEL4_NOT_SUPPORTED);

      }



      return BTM_MODE4_LEVEL4_NOT_SUPPORTED;

      return tBTM_STATUS::BTM_MODE4_LEVEL4_NOT_SUPPORTED;

    }

  }