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

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

rnr: log when callback not sent due to cod being zero am: d7d2dd27 

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



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

system/btif/src/btif_dm.cc

+6 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
#include "internal_include/stack_config.h"

#include "main/shim/le_advertising_manager.h"

#include "os/log.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"
@@ -1411,7 +1412,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 
                        &bdaddr, &properties[2]) == BT_STATUS_SUCCESS) {

          LOG_VERBOSE("BTA_DM_NAME_READ_EVT, cod in storage=0x%08x", cod);

        } else {

          LOG_DEBUG("BTA_DM_NAME_READ_EVT, no cod in storage");

          LOG_INFO("BTA_DM_NAME_READ_EVT, no cod in storage");

          cod = 0;

        }

        if (cod != 0) {
@@ -1419,6 +1420,10 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 
          BTIF_STORAGE_FILL_PROPERTY(&properties[2], BT_PROPERTY_CLASS_OF_DEVICE, sizeof(uint32_t), &cod);

          LOG_DEBUG("report new device to JNI");

          GetInterfaceToProfiles()->events->invoke_device_found_cb(3, properties);

        } else {

          LOG_INFO("Skipping RNR callback because cod is zero addr:%s name:%s",

                   ADDRESS_TO_LOGGABLE_CSTR(bdaddr),

                   PRIVATE_NAME(p_search_data->disc_res.bd_name));

        }

        /** @} */

      }