commit 6059d6c9efa3bced5718714235e19775ee1df83a
author Chris Manton <cmanton@google.com> Fri Jun 14 04:58:45 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 14 04:58:45 2024 +0000
tree 2f1716f789b0e625e770949c93273281108ee6e1
parent 11203682bb57ac4d4941fb3b2e5c0a03ebfc9f92
parent 5978a92641d8e3b1cb9d84b9a6327127fdbe1b39

Flag: Remove rnr_cancel_before_event_race am: 5978a92641

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

Change-Id: Ic38e207e4ccf945930a2ac2ef787e1c5616a1b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

flags/rnr.aconfig

diff --git a/flags/rnr.aconfig b/flags/rnr.aconfig
index 4b1f3ca..c934aa6 100644
--- a/flags/rnr.aconfig
+++ b/flags/rnr.aconfig
@@ -2,13 +2,6 @@
 container: "com.android.btservices"
 
 flag {
-    name: "rnr_cancel_before_event_race"
-    namespace: "bluetooth"
-    description: "Address race condition when rnr cancel and event arrive close together"
-    bug: "316037290"
-}
-
-flag {
     name: "rnr_present_during_service_discovery"
     namespace: "bluetooth"
     description: "Present RNR result during service discovery"

system/gd/hci/remote_name_request.cc

diff --git a/system/gd/hci/remote_name_request.cc b/system/gd/hci/remote_name_request.cc
index dd37486..3df4ae3 100644
--- a/system/gd/hci/remote_name_request.cc
+++ b/system/gd/hci/remote_name_request.cc
@@ -154,23 +154,15 @@
   }
 
   void actually_cancel_remote_name_request(Address address) {
-    if (com::android::bluetooth::flags::rnr_cancel_before_event_race()) {
-      if (pending_) {
-        log::info("Cancelling remote name request to {}", address.ToRedactedStringForLogging());
-        hci_layer_->EnqueueCommand(
-            RemoteNameRequestCancelBuilder::Create(address),
-            handler_->BindOnceOn(this, &impl::check_cancel_status, address));
-      } else {
-        log::info(
-            "Ignoring cancel RNR as RNR event already received to {}",
-            address.ToRedactedStringForLogging());
-      }
-    } else {
-      log::assert_that(pending_ == true, "assert failed: pending_ == true");
+    if (pending_) {
       log::info("Cancelling remote name request to {}", address.ToRedactedStringForLogging());
       hci_layer_->EnqueueCommand(
           RemoteNameRequestCancelBuilder::Create(address),
           handler_->BindOnceOn(this, &impl::check_cancel_status, address));
+    } else {
+      log::info(
+          "Ignoring cancel RNR as RNR event already received to {}",
+          address.ToRedactedStringForLogging());
     }
   }
 

system/gd/hci/remote_name_request_test.cc

diff --git a/system/gd/hci/remote_name_request_test.cc b/system/gd/hci/remote_name_request_test.cc
index 815cadf..2d77269 100644
--- a/system/gd/hci/remote_name_request_test.cc
+++ b/system/gd/hci/remote_name_request_test.cc
@@ -659,12 +659,7 @@
   EXPECT_EQ(rnr_command.GetBdAddr(), address2);
 }
 
-#define MY_PACKAGE com::android::bluetooth::flags
-
-TEST_F_WITH_FLAGS(
-    RemoteNameRequestModuleTest,
-    CancelJustWhenRNREventReturns,
-    REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(MY_PACKAGE, rnr_cancel_before_event_race))) {
+TEST_F(RemoteNameRequestModuleTest, CancelJustWhenRNREventReturns) {
   auto promise = std::promise<std::tuple<ErrorCode, std::array<uint8_t, 248>>>{};
   auto future = promise.get_future();