From 1e80cedeac1c29117423d95fef2dd9ec89adf22d Mon Sep 17 00:00:00 2001
From: Mupceet <laiguizhong@huawei.com>
Date: Thu, 10 Nov 2022 09:38:01 +0800
Subject: [PATCH] fix get focus

Signed-off-by: Mupceet <laiguizhong@huawei.com>
---
 .../accessible_ability_channel_client.h       |  1 +
 .../src/accessible_ability_channel_client.cpp | 28 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/frameworks/aafwk/include/accessible_ability_channel_client.h b/frameworks/aafwk/include/accessible_ability_channel_client.h
index 4b280ea68..eae04a82c 100644
--- a/frameworks/aafwk/include/accessible_ability_channel_client.h
+++ b/frameworks/aafwk/include/accessible_ability_channel_client.h
@@ -165,6 +165,7 @@ private:
     int32_t GenerateRequestId();
 
     int32_t channelId_ = INVALID_CHANNEL_ID;
+    int32_t accessibilityFocusedWindowId_ = INVALID_WINDOW_ID;
     sptr<IAccessibleAbilityChannel> proxy_ = nullptr;
     std::atomic<int> requestId_ = 0;
 };
diff --git a/frameworks/aafwk/src/accessible_ability_channel_client.cpp b/frameworks/aafwk/src/accessible_ability_channel_client.cpp
index 07422976c..431d8ccbf 100644
--- a/frameworks/aafwk/src/accessible_ability_channel_client.cpp
+++ b/frameworks/aafwk/src/accessible_ability_channel_client.cpp
@@ -70,14 +70,21 @@ RetError AccessibleAbilityChannelClient::FindFocusedElementInfo(int32_t accessib
     }
     std::future<void> promiseFuture = elementOperator->promise_.get_future();
 
-    RetError ret = proxy_->FindFocusedElementInfo(accessibilityWindowId,
+    int32_t windowId = accessibilityWindowId;
+    if (accessibilityWindowId == ANY_WINDOW_ID && focusType == FOCUS_TYPE_ACCESSIBILITY &&
+        accessibilityFocusedWindowId_ != INVALID_WINDOW_ID) {
+        windowId = accessibilityFocusedWindowId_;
+        HILOG_INFO("Convert into accessibility focused window id[%{public}d]", windowId);
+    }
+
+    RetError ret = proxy_->FindFocusedElementInfo(windowId,
         elementId, focusType, requestId, elementOperator);
     if (ret != RET_OK) {
         HILOG_ERROR("FindFocusedElementInfo failed. ret[%{public}d]", ret);
         return ret;
     }
-    HILOG_DEBUG("channelId:%{public}d, accessibilityWindowId:%{public}d, elementId:%{public}d, focusType:%{public}d",
-        channelId_, accessibilityWindowId, elementId, focusType);
+    HILOG_DEBUG("channelId:%{public}d, windowId:%{public}d, elementId:%{public}d, focusType:%{public}d",
+        channelId_, windowId, elementId, focusType);
 
     std::future_status wait = promiseFuture.wait_for(std::chrono::milliseconds(TIME_OUT_OPERATOR));
     if (wait != std::future_status::ready) {
@@ -141,6 +148,21 @@ RetError AccessibleAbilityChannelClient::ExecuteAction(int32_t accessibilityWind
     }
     HILOG_INFO("Get result successfully from ace. executeActionResult_[%{public}d]",
         elementOperator->executeActionResult_);
+
+    if (elementOperator->executeActionResult_) {
+        switch (action) {
+            case ActionType::ACCESSIBILITY_ACTION_ACCESSIBILITY_FOCUS:
+                accessibilityFocusedWindowId_ = accessibilityWindowId;
+                HILOG_INFO("Set accessibility focused window id[%{public}d]", accessibilityFocusedWindowId_);
+                break;
+            case ActionType::ACCESSIBILITY_ACTION_CLEAR_ACCESSIBILITY_FOCUS:
+                accessibilityFocusedWindowId_ = INVALID_WINDOW_ID;
+                HILOG_INFO("Clear accessibility focused window id");
+                break;
+            default:
+                break;
+        }
+    }
     return elementOperator->executeActionResult_ ? RET_OK : RET_ERR_PERFORM_ACTION_FAILED_BY_ACE;
 }