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

Commit 051bb933 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Flag 24Q3: remove rnr_reset_state_at_cancel" into main am: c0734ca3 am: 53332df3 

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



Change-Id: I517cafe22bf4f88ce775cc2dd65612e8c0ac4d0c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9fdaa0dd 53332df3

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_reset_state_at_cancel"

    namespace: "bluetooth"

    description: "Clear rnr in-progress-state when rnr_cancel called"

    bug: "333094503"

}



flag {

    name: "rnr_store_device_type"

    namespace: "bluetooth"

system/stack/rnr/remote_name_request.cc

+1 −3
Original line number Diff line number Diff line
@@ -323,10 +323,8 @@ tBTM_STATUS BTM_CancelRemoteDeviceName(void) { 
    btm_inq_rmt_name_failed_cancelled();

  } else {

    bluetooth::shim::ACL_CancelRemoteNameRequest(btm_cb.rnr.remname_bda);

    if (com::android::bluetooth::flags::rnr_reset_state_at_cancel()) {

    btm_process_remote_name(&btm_cb.rnr.remname_bda, nullptr, 0, HCI_ERR_UNSPECIFIED);

  }

  }

  return tBTM_STATUS::BTM_CMD_STARTED;

}