From cc4a13ac26eef82017b867abac0a88c0ea08504e Mon Sep 17 00:00:00 2001
From: Guogang Li <guogang@google.com>
Date: Thu, 20 Mar 2025 14:53:31 -0700
Subject: [PATCH] Fix the bug to stop scanning when adapter is disabled

PiperOrigin-RevId: 738949740
---
 internal/platform/implementation/windows/ble_v2.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/internal/platform/implementation/windows/ble_v2.cc b/internal/platform/implementation/windows/ble_v2.cc
index 0f948d4b..53db21c6 100644
--- a/internal/platform/implementation/windows/ble_v2.cc
+++ b/internal/platform/implementation/windows/ble_v2.cc
@@ -28,7 +28,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/strings/escaping.h"
-
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
@@ -651,14 +650,19 @@ bool BleV2Medium::StopScanning() {
   LOG(INFO) << __func__ << ": BLE StopScanning: service_uuid: "
             << absl::StrCat(absl::Hex(service_uuid16_));
   if (!adapter_->IsEnabled()) {
-    LOG(WARNING) << "BLE cannot stop scanning because the "
+    LOG(WARNING) << "BLE is trying to stop scanning when the "
                     "bluetooth adapter is not enabled.";
-    return false;
+    if (!watchers_.empty()) {
+      LOG(INFO) << "Clear watchers when adapter is not enabled.";
+      watchers_.clear();
+    }
+
+    return true;
   }
 
   if (watchers_.empty()) {
     LOG(WARNING) << "BLE scanning is not running.";
-    return false;
+    return true;
   }
 
   watchers_.clear();