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

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

Flag: Remove rnr_present_during_service_discovery am: 6e4d5693 am: 2333c3fe 

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



Change-Id: Ibd7136f16e4ac48090740a3d19ec4b1277d60689
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 578ab6a3 2333c3fe

flags/rnr.aconfig

+0 −7
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "rnr_present_during_service_discovery"

    namespace: "bluetooth"

    description: "Present RNR result during service discovery"

    bug: "321809163"

}



flag {

    name: "rnr_reset_state_at_cancel"

    namespace: "bluetooth"

system/btif/src/btif_dm.cc

+2 −6
Original line number Diff line number Diff line
@@ -2021,12 +2021,8 @@ static void btif_on_name_read(RawAddress bd_addr, tHCI_ERROR_CODE hci_status, 
  // Differentiate between merged callbacks

  if (!during_device_search

      // New fix after refactor, this callback is needed for the fix to work

      &&

      !com::android::bluetooth::flags::separate_service_and_device_discovery()

      // Original fix, this callback should not be called if RNR should not be

      // called

      &&

      !com::android::bluetooth::flags::rnr_present_during_service_discovery()) {

      && !com::android::bluetooth::flags::

             separate_service_and_device_discovery()) {

    log::info("Skipping name read event - called on bad callback.");

    return;

  }

system/btif/test/btif_dm_test.cc

+1 −5
Original line number Diff line number Diff line
@@ -155,12 +155,8 @@ class BtifDmWithStackTest : public BtifDmTest { 
  bluetooth::ModuleList modules_;

};



#define MY_PACKAGE com::android::bluetooth::flags



TEST_F_WITH_FLAGS(BtifDmWithStackTest,

                  btif_dm_search_services_evt__BTA_DM_NAME_READ_EVT,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(

                      MY_PACKAGE, rnr_present_during_service_discovery))) {

                  btif_dm_search_services_evt__BTA_DM_NAME_READ_EVT) {

  static struct {

    bt_status_t status;

    RawAddress bd_addr;