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

Commit 0bb05a34 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I9dc3c034,I34bb2687 am: 2029e247 am: e3907430 am: f9fef559... 

Merge changes I9dc3c034,I34bb2687 am: 2029e247 am: e3907430 am: f9fef559 am: 7bee1c77 am: e74c23e5

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



Change-Id: Ic019f74a3e7a2153915a17c2595a6785e11ff126
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7dbd4664 e74c23e5

system/bta/csis/csis_client.cc

+7 −2
Original line number Original line Diff line number Diff line
@@ -1106,6 +1106,11 @@ class CsisClientImpl : public CsisClient { 




    csis_instance->SetRank((value[0]));

    csis_instance->SetRank((value[0]));

    auto csis_group = FindCsisGroup(csis_instance->GetGroupId());

    auto csis_group = FindCsisGroup(csis_instance->GetGroupId());

    if (!csis_group) {

      LOG(ERROR) << __func__ << " Unknown group id yet";

      return;

    }



    csis_group->SortByCsisRank();

    csis_group->SortByCsisRank();





    if (notify_valid_services) NotifyCsisDeviceValidAndStoreIfNeeded(device);

    if (notify_valid_services) NotifyCsisDeviceValidAndStoreIfNeeded(device);
@@ -1256,8 +1261,8 @@ class CsisClientImpl : public CsisClient { 
  void CsisActiveObserverSet(bool enable) {

  void CsisActiveObserverSet(bool enable) {

    bool is_ad_type_filter_supported =

    bool is_ad_type_filter_supported =

        bluetooth::shim::is_ad_type_filter_supported();

        bluetooth::shim::is_ad_type_filter_supported();

    LOG_INFO("Group_id %d: enable: %d, is_ad_type_filter_supported: %d", enable,

    LOG_INFO("Group_id %d: enable: %d, is_ad_type_filter_supported: %d",

             discovering_group_, is_ad_type_filter_supported);

             discovering_group_, enable, is_ad_type_filter_supported);

    if (is_ad_type_filter_supported) {

    if (is_ad_type_filter_supported) {

      bluetooth::shim::set_ad_type_rsi_filter(enable);

      bluetooth::shim::set_ad_type_rsi_filter(enable);

    } else {

    } else {