From d39412222da7176027cd5466905210f6861780a5 Mon Sep 17 00:00:00 2001
From: chenrui_wza <chenrui129@h-partners.com>
Date: Fri, 7 Aug 2026 15:01:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B9=B6=E5=8F=91?=
 =?UTF-8?q?=E8=AF=BB=E5=86=99scbTokenMap=5F=E5=AF=BC=E8=87=B4=E7=9A=84crus?=
 =?UTF-8?q?h=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CO-authored-by: OpenCode+GLM5

Signed-off-by: chenrui_wza <chenrui129@h-partners.com>
---
 services/aams/include/accessibility_window_connection.h      | 5 +----
 services/aams/src/accessibility_window_connection.cpp        | 4 ++--
 .../test/mock/src/mock_accessibility_window_connection.cpp   | 3 ++-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/services/aams/include/accessibility_window_connection.h b/services/aams/include/accessibility_window_connection.h
index 29975321e..ce5a9b4f7 100644
--- a/services/aams/include/accessibility_window_connection.h
+++ b/services/aams/include/accessibility_window_connection.h
@@ -20,10 +20,7 @@
 #include "hilog_wrapper.h"
 #include "ffrt.h"
 #include "safe_map.h"
-#include <unordered_set>
-
 #include <atomic>
-#include <unordered_set>
 
 namespace OHOS {
 namespace Accessibility {
@@ -132,7 +129,7 @@ private:
     ffrt::mutex proxyMapMutex_;
     std::unordered_map<uint64_t, std::pair<sptr<IAccessibilityElementOperator>, sptr<IRemoteObject::DeathRecipient>>>
         proxyMap_;
-    std::unordered_set<uint32_t> scbTokenMap_;
+    SafeMap<uint32_t, bool> scbTokenMap_;
 };
 } // namespace Accessibility
 } // namespace OHOS
diff --git a/services/aams/src/accessibility_window_connection.cpp b/services/aams/src/accessibility_window_connection.cpp
index 0d43612b9..6b6953afa 100644
--- a/services/aams/src/accessibility_window_connection.cpp
+++ b/services/aams/src/accessibility_window_connection.cpp
@@ -95,7 +95,7 @@ RetError AccessibilityWindowConnection::SetTokenIdMap(const int32_t treeId,
     if (windowId_ != SCENE_BOARD_WINDOW_ID) {
         tokenIdMap_.EnsureInsert(treeId, tokenId);
     } else {
-        scbTokenMap_.insert(tokenId);
+        scbTokenMap_.EnsureInsert(tokenId, true);
     }
     return RET_OK;
 }
@@ -108,7 +108,7 @@ uint32_t AccessibilityWindowConnection::GetTokenIdMap(const int32_t treeId)
 
 bool AccessibilityWindowConnection::CheckScbTokenIdMap(uint32_t tokenId)
 {
-    return scbTokenMap_.count(tokenId) != 0;
+    return scbTokenMap_.ReadVal(tokenId);
 }
 
 void AccessibilityWindowConnection::GetAllTreeId(std::vector<int32_t> &treeIds)
diff --git a/services/aams/test/mock/src/mock_accessibility_window_connection.cpp b/services/aams/test/mock/src/mock_accessibility_window_connection.cpp
index 6c483bdd8..5a7b6ebbf 100644
--- a/services/aams/test/mock/src/mock_accessibility_window_connection.cpp
+++ b/services/aams/test/mock/src/mock_accessibility_window_connection.cpp
@@ -182,7 +182,8 @@ void AccessibilityWindowConnection::ResetBrokerProxy()
 
 bool AccessibilityWindowConnection::CheckScbTokenIdMap(uint32_t tokenId)
 {
-    return scbTokenMap_.count(tokenId) != 0;
+    bool value = false;
+    return scbTokenMap_.Find(tokenId, value);
 }
  
 sptr<IAccessibilityElementOperator> AccessibilityWindowConnection::GetProxy(uint64_t displayId)

From 668ce217e1ccb870ce6f077aa33bceec943ff14a Mon Sep 17 00:00:00 2001
From: chenrui_wza <chenrui129@h-partners.com>
Date: Fri, 7 Aug 2026 16:06:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B9=B6=E5=8F=91?=
 =?UTF-8?q?=E8=AF=BB=E5=86=99scbTokenMap=5F=E5=AF=BC=E8=87=B4=E7=9A=84crus?=
 =?UTF-8?q?h=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CO-authored-by: OpenCode+GLM5

Signed-off-by: chenrui_wza <chenrui129@h-partners.com>
---
 .../test/mock/src/mock_accessibility_window_connection.cpp  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/aams/test/mock/src/mock_accessibility_window_connection.cpp b/services/aams/test/mock/src/mock_accessibility_window_connection.cpp
index 5a7b6ebbf..f8cb20acf 100644
--- a/services/aams/test/mock/src/mock_accessibility_window_connection.cpp
+++ b/services/aams/test/mock/src/mock_accessibility_window_connection.cpp
@@ -182,10 +182,9 @@ void AccessibilityWindowConnection::ResetBrokerProxy()
 
 bool AccessibilityWindowConnection::CheckScbTokenIdMap(uint32_t tokenId)
 {
-    bool value = false;
-    return scbTokenMap_.Find(tokenId, value);
+    return scbTokenMap_.ReadVal(tokenId);
 }
- 
+
 sptr<IAccessibilityElementOperator> AccessibilityWindowConnection::GetProxy(uint64_t displayId)
 {
     std::lock_guard<ffrt::mutex> lock(proxyMutex_);
@@ -198,6 +197,7 @@ sptr<IAccessibilityElementOperator> AccessibilityWindowConnection::GetProxy(uint
         return proxyMap_[displayId].first;
     }
 }
+
 sptr<IAccessibilityElementOperator> AccessibilityWindowConnection::GetRawProxy(uint64_t displayId)
 {
     std::lock_guard<ffrt::mutex> lock(proxyMutex_);