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

Commit 2ea97bbc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "stack::inq Log set interlaced page/inq scan failure" into main am: bfb200c2 

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



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

system/stack/btm/btm_inq.cc

+18 −0
Original line number Diff line number Diff line
@@ -362,6 +362,15 @@ void BTM_EnableInterlacedInquiryScan() { 
  if (!bluetooth::shim::GetController()->SupportsInterlacedInquiryScan() ||

      inq_scan_type != BTM_SCAN_TYPE_INTERLACED ||

      btm_cb.btm_inq_vars.inq_scan_type == BTM_SCAN_TYPE_INTERLACED) {

    log::warn(

        "Unable to set interlaced inquiry scan controller_supported:%c "

        "property_supported:%c already_in_mode:%c",

        (bluetooth::shim::GetController()->SupportsInterlacedInquiryScan())

            ? 'T'

            : 'F',

        (inq_scan_type != BTM_SCAN_TYPE_INTERLACED) ? 'T' : 'F',

        (btm_cb.btm_inq_vars.inq_scan_type == BTM_SCAN_TYPE_INTERLACED) ? 'T'

                                                                        : 'F');

    return;

  }
@@ -378,6 +387,15 @@ void BTM_EnableInterlacedPageScan() { 
  if (!bluetooth::shim::GetController()->SupportsInterlacedInquiryScan() ||

      page_scan_type != BTM_SCAN_TYPE_INTERLACED ||

      btm_cb.btm_inq_vars.page_scan_type == BTM_SCAN_TYPE_INTERLACED) {

    log::warn(

        "Unable to set interlaced page scan controller_supported:%c "

        "property_supported:%c already_in_mode:%c",

        (bluetooth::shim::GetController()->SupportsInterlacedInquiryScan())

            ? 'T'

            : 'F',

        (page_scan_type != BTM_SCAN_TYPE_INTERLACED) ? 'T' : 'F',

        (btm_cb.btm_inq_vars.page_scan_type == BTM_SCAN_TYPE_INTERLACED) ? 'T'

                                                                         : 'F');

    return;

  }