视检问题修正

Signed-off-by: Mupceet <laiguizhong@huawei.com>

frameworks/aafwk/src/accessibility_extension_context.cpp

@@ -75,7 +75,7 @@ std::shared_ptr<DisplayResizeController>& AccessibilityExtensionContext::GetDisp
 {
     HILOG_DEBUG("start.");
 
-    // this is a temp deal: To make sure the id of DEFAULT_DISPALY.
+    // This is a temp deal: To make sure the id of DEFAULT_DISPALY.
     uint32_t DEFAULT_DISPALY = 0;
     return GetDisplayResizeController(DEFAULT_DISPALY);
 }

frameworks/aafwk/src/accessible_ability_client_stub_impl.cpp

@@ -92,7 +92,12 @@ void AccessibleAbilityClientStubImpl::Init(const sptr<IAccessibleAbilityChannel>
             return;
         }
 
-        AccessibilityUITestAbility::GetInstance()->SetChannelId(channelId);
+        auto instance = AccessibilityUITestAbility::GetInstance();
+        if (!instance) {
+            HILOG_ERROR("instance is nullptr");
+            return;
+        }
+        instance->SetChannelId(channelId);
         AccessibilityOperator::AddChannel(channelId, channel);
         channelId_ = channelId;
         channel_ = channel;
@@ -133,7 +138,12 @@ void AccessibleAbilityClientStubImpl::Disconnect(const int channelId)
             listener_ = nullptr;
         }
     } else {
-        AccessibilityUITestAbility::GetInstance()->SetChannelId(channelId_);
+        auto instance = AccessibilityUITestAbility::GetInstance();
+        if (!instance) {
+            HILOG_ERROR("instance is nullptr");
+            return;
+        }
+        instance->SetChannelId(channelId_);
         if (uiTestListener_) {
             uiTestListener_->OnAbilityDisconnected();
             uiTestListener_ = nullptr;
@@ -200,8 +210,12 @@ void AccessibleAbilityClientStubImpl::OnGestureSimulateResult(const int sequence
 
         if (uiTestEnabled_) {
             HILOG_DEBUG("Dispatch the result of simulation gesture.");
-            AccessibilityUITestAbility::GetInstance()->DispatchOnSimulationGestureResult(
-                sequence, completedSuccessfully);
+            auto instance = AccessibilityUITestAbility::GetInstance();
+            if (!instance) {
+                HILOG_ERROR("instance is nullptr");
+                return;
+            }
+            instance->DispatchOnSimulationGestureResult(sequence, completedSuccessfully);
         }
     }
 }

frameworks/aafwk/src/js_accessibility_extension.cpp

@@ -152,7 +152,7 @@ bool JsAccessibilityExtension::OnKeyPressEvent(const MMI::KeyEvent& keyEvent)
 
     HandleScope handleScope(jsRuntime_);
     NativeEngine* nativeEngine = &jsRuntime_.GetNativeEngine();
-    // wrap keyEvent
+    // Wrap keyEvent
     napi_value napiEventInfo = nullptr;
     if (napi_create_object(reinterpret_cast<napi_env>(nativeEngine), &napiEventInfo) != napi_ok) {
         HILOG_ERROR("Create keyEvent object failed.");
@@ -163,7 +163,7 @@ bool JsAccessibilityExtension::OnKeyPressEvent(const MMI::KeyEvent& keyEvent)
     NativeValue* argv[] = {nativeEventInfo};
     NativeValue* nativeResult = CallObjectMethod("onKeyPressEvent", argv, 1);
 
-    // unwrap result
+    // Unwrap result
     bool result = false;
     if (!ConvertFromJsValue(*nativeEngine, nativeResult, result)) {
         HILOG_ERROR("ConvertFromJsValue failed");
@@ -208,7 +208,6 @@ void JsAccessibilityExtension::GetSrcPath(std::string &srcPath)
         return;
     }
     if (!Extension::abilityInfo_->isModuleJson) {
-        /* temporary compatibility api8 + config.json */
         srcPath.append(Extension::abilityInfo_->package);
         srcPath.append("/assets/js/");
         if (!Extension::abilityInfo_->srcPath.empty()) {

frameworks/aafwk/src/js_accessibility_extension_context.cpp

@@ -76,13 +76,13 @@ private:
     NativeValue* OnGetFocusElementInfo(NativeEngine& engine, NativeCallbackInfo& info)
     {
         HILOG_INFO("called.");
-        // only support one or two params
+        // Only support one or two params
         if (info.argc != ARGS_SIZE_ONE && info.argc != ARGS_SIZE_TWO) {
             HILOG_ERROR("Not enough params");
             return engine.CreateUndefined();
         }
 
-        // unwrap focusType
+        // Unwrap focusType
         std::string focusType;
         if (!ConvertFromJsValue(engine, info.argv[PARAM0], focusType)) {
             HILOG_ERROR("ConvertFromJsValue failed");
@@ -137,7 +137,7 @@ private:
     NativeValue* OnGetRootElementInfo(NativeEngine& engine, NativeCallbackInfo& info)
     {
         HILOG_INFO("called.");
-        // only support zero or one params
+        // Only support zero or one params
         if (info.argc != ARGS_SIZE_ZERO && info.argc != ARGS_SIZE_ONE) {
             HILOG_ERROR("Not enough params");
             return engine.CreateUndefined();
@@ -182,7 +182,7 @@ private:
     NativeValue* OnGetWindows(NativeEngine& engine, NativeCallbackInfo& info)
     {
         HILOG_INFO("called.");
-        // only support zero or one params
+        // Only support zero or one params
         if (info.argc != ARGS_SIZE_ZERO && info.argc != ARGS_SIZE_ONE) {
             HILOG_ERROR("Not enough params");
             return engine.CreateUndefined();
@@ -225,13 +225,13 @@ private:
     NativeValue* OnExecuteCommonAction(NativeEngine& engine, NativeCallbackInfo& info)
     {
         HILOG_INFO("called.");
-        // only support one or two params
+        // Only support one or two params
         if (info.argc != ARGS_SIZE_ONE && info.argc != ARGS_SIZE_TWO) {
             HILOG_ERROR("Not enough params");
             return engine.CreateUndefined();
         }
 
-        // unwrap actionType
+        // Unwrap actionType
         std::string actionType;
         if (!ConvertFromJsValue(engine, info.argv[PARAM0], actionType)) {
             HILOG_ERROR("ConvertFromJsValue failed");
@@ -271,29 +271,29 @@ private:
     NativeValue* OnGestureSimulate(NativeEngine& engine, NativeCallbackInfo& info)
     {
         HILOG_INFO("called.");
-        // only support two or three params
+        // Only support two or three params
         if (info.argc != ARGS_SIZE_TWO && info.argc != ARGS_SIZE_THREE) {
             HILOG_ERROR("Not enough params");
             return engine.CreateUndefined();
         }
 
-        // unwrap gesturePaths
+        // Unwrap gesturePaths
         napi_value nGesturePaths = reinterpret_cast<napi_value>(info.argv[PARAM0]);
         std::vector<GesturePathDefine> gesturePaths;
         ConvertGesturePathsJSToNAPI(reinterpret_cast<napi_env>(&engine), nGesturePaths, gesturePaths);
 
-        // unwrap callback
+        // Unwrap callback
         if (info.argv[PARAM1]->TypeOf() != NATIVE_FUNCTION) {
             HILOG_ERROR("The type of params is %{public}d.", info.argv[PARAM1]->TypeOf());
             return engine.CreateUndefined();
         }
-        // create callback info
+        // Create callback info
         std::shared_ptr<jsGestureResultListenerInfo> pCallbackInfo = std::make_shared<jsGestureResultListenerInfo>();
         pCallbackInfo->env_ = reinterpret_cast<napi_env>(&engine);
         NAPI_CALL(reinterpret_cast<napi_env>(&engine), napi_create_reference(reinterpret_cast<napi_env>(&engine),
             reinterpret_cast<napi_value>(info.argv[PARAM1]), 1, &pCallbackInfo->callback_));
         pCallbackInfo->listener_ = std::make_shared<JSGestureResultListener>();
-        // save callback info
+        // Save callback info
         gestureInjectSequence ++;
         jsGestureResultListenerInfos[gestureInjectSequence] = pCallbackInfo;
 

frameworks/aafwk/test/unittest/accessible_ability_client_stub_impl_test.cpp

@@ -115,7 +115,7 @@ void AccessibleAbilityClientStubImplUnitTest::InitToSetChannelId()
 
     stub_->RegisterListenerImpl(listener);
     stub_->Init(channel, channelId);
-    sleep(1); // sleep for task completed.
+    sleep(1); // Sleep for task completed.
 
     stub = nullptr;
     channel = nullptr;
@@ -154,7 +154,7 @@ HWTEST_F(AccessibleAbilityClientStubImplUnitTest, AccessibleAbilityClientStubImp
     int channelId = 0;
 
     stub_->Init(channel, channelId);
-    sleep(1); // sleep for task completed.
+    sleep(1); // Sleep for task completed.
 
     stub = nullptr;
     channel = nullptr;
@@ -179,7 +179,7 @@ HWTEST_F(AccessibleAbilityClientStubImplUnitTest, AccessibleAbilityClientStubImp
 
     stub_->RegisterListenerImpl(listener);
     stub_->Init(channel, channelId);
-    sleep(1); // sleep for task completed.
+    sleep(1); // Sleep for task completed.
 
     stub = nullptr;
     channel = nullptr;
@@ -200,7 +200,7 @@ HWTEST_F(AccessibleAbilityClientStubImplUnitTest,
     int channelId = 0;
     InitToSetChannelId();
     stub_->Disconnect(channelId);
-    sleep(1); // sleep for task Disconnect completed.
+    sleep(1); // Sleep for task Disconnect completed.
 
     GTEST_LOG_(INFO) << "AccessibleAbilityClientStubImpl_Unittest_Disconnect_001 end";
 }
@@ -219,7 +219,7 @@ HWTEST_F(AccessibleAbilityClientStubImplUnitTest,
 
     InitToSetChannelId();
     stub_->OnAccessibilityEvent(eventInfo);
-    sleep(1); // sleep for task completed.
+    sleep(1); // Sleep for task completed.
 
     GTEST_LOG_(INFO) << "AccessibleAbilityClientStubImpl_Unittest_OnAccessibilityEvent_001 end";
 }
@@ -239,7 +239,7 @@ HWTEST_F(AccessibleAbilityClientStubImplUnitTest,
 
     InitToSetChannelId();
     stub_->OnKeyPressEvent(*keyEvent, sequence);
-    sleep(1); // sleep for task completed.
+    sleep(1); // Sleep for task completed.
 
     GTEST_LOG_(INFO) << "AccessibleAbilityClientStubImpl_Unittest_OnKeyPressEvent_001 end";
 }
@@ -262,7 +262,7 @@ HWTEST_F(AccessibleAbilityClientStubImplUnitTest,
 
     InitToSetChannelId();
     stub_->OnDisplayResized(displayId, rect, scale, centerX, centerY);
-    sleep(1); // sleep for task completed.
+    sleep(1); // Sleep for task completed.
 
     GTEST_LOG_(INFO) << "AccessibleAbilityClientStubImpl_Unittest_OnDisplayResized_001 end";
 }
@@ -282,7 +282,7 @@ HWTEST_F(AccessibleAbilityClientStubImplUnitTest,
 
     InitToSetChannelId();
     stub_->OnGestureSimulateResult(sequence, completedSuccessfully);
-    sleep(1); // sleep for task completed.
+    sleep(1); // Sleep for task completed.
 
     GTEST_LOG_(INFO) << "AccessibleAbilityClientStubImpl_Unittest_OnGestureSimulateResult_001 end";
 }

frameworks/asacfwk/include/accessibility_element_operator_async_mng.h

@@ -72,7 +72,7 @@ private:
     int feedbackSequence_ = 0;
     bool completed_ = false;
     static std::recursive_mutex mutex_;
-    static int sequence_;    // matched request with callback result
+    static int sequence_;    // Matched request with callback result
 };
 } // namespace Accessibility
 } // namespace OHOS

frameworks/asacfwk/src/accessibility_ability_info.cpp

@@ -59,7 +59,7 @@ bool AccessibilityAbilityInfo::ParseAAConfig(std::string &config)
     HILOG_DEBUG("start.");
     nlohmann::json sourceJson = nlohmann::json::parse(config);
 
-    // accessibilityCapabilities
+    // Parse accessibilityCapabilities
     vector<string> capabilities;
     if (!JsonUtils::GetStringVecFromJson(
         sourceJson, AccessibleAbility_JSON_KEY_ACCESSIBILITY_CAPABILITIES,
@@ -69,7 +69,7 @@ bool AccessibilityAbilityInfo::ParseAAConfig(std::string &config)
     }
     PraseVecUtils::ParseCapabilitiesFromVec(capabilities, capabilities_);
 
-    // accessibilityCapabilityRationale
+    // Parse accessibilityCapabilityRationale
     if (!JsonUtils::GetStringFromJson(
         sourceJson,
         AccessibleAbility_JSON_KEY_ACCESSIBILITY_CAPABILITIES_RATIONALE,
@@ -78,7 +78,7 @@ bool AccessibilityAbilityInfo::ParseAAConfig(std::string &config)
         return false;
     }
 
-    // settingsAbility
+    // Parse settingsAbility
     if (!JsonUtils::GetStringFromJson(
         sourceJson, AccessibleAbility_JSON_KEY_SETTINGS_ABILITY,
         settingsAbility_)) {

frameworks/asacfwk/src/accessibility_element_info.cpp

@@ -20,7 +20,7 @@
 
 namespace OHOS {
 namespace Accessibility {
-// text move step
+// Text move step
 const std::string MOVE_UNIT_CHARACTER = "char";
 const std::string MOVE_UNIT_WORD = "word";
 const std::string MOVE_UNIT_LINE = "line";
@@ -58,7 +58,6 @@ const std::string HTML_ITEM_H5 = "h5";
 const std::string HTML_ITEM_H6 = "h6";
 const std::string HTML_ITEM_UNKOWN = "unknown";
 
-/* AccessibilityElementInfo       Parcel struct                 */
 bool AccessibilityElementInfo::ReadFromParcel(Parcel &parcel)
 {
     READ_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, windowId_);

frameworks/asacfwk/src/accessibility_element_operator_stub.cpp

@@ -191,13 +191,17 @@ void AccessibilityElementOperatorStub::SearchElementInfoByAccessibilityId(const
     const int requestId, const sptr<IAccessibilityElementOperatorCallback> &callback, const int mode)
 {
     HILOG_DEBUG("start");
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        HILOG_ERROR("instance is nullptr");
+        return;
+    }
     AccessibilityElementOperatorCallback *tempCallback = new CallbackImpl(requestId,
         CallbackImpl::CALLBACK_BY_ACCESSIBILITY_ID);
     std::lock_guard<std::recursive_mutex> lock(mutex_);
     aaCallbacks_.insert(
         std::pair<const int, const sptr<IAccessibilityElementOperatorCallback>>(requestId, callback));
-    std::shared_ptr<AccessibilityElementOperator> obj =
-        AccessibilitySystemAbilityClient::GetInstance()->GetOperatorObject(GetWindowId());
+    std::shared_ptr<AccessibilityElementOperator> obj = instance->GetOperatorObject(GetWindowId());
     if (obj != nullptr) {
         obj->SearchElementInfoByAccessibilityId(elementId, requestId, *tempCallback, mode);
     } else {
@@ -210,13 +214,17 @@ void AccessibilityElementOperatorStub::SearchElementInfosByText(const long eleme
     const int requestId, const sptr<IAccessibilityElementOperatorCallback> &callback)
 {
     HILOG_DEBUG("start");
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        HILOG_ERROR("instance is nullptr");
+        return;
+    }
     AccessibilityElementOperatorCallback *tempCallback = new CallbackImpl(requestId,
         CallbackImpl::CALLBACK_BY_TEXT);
     std::lock_guard<std::recursive_mutex> lock(mutex_);
     aaCallbacks_.insert(
         std::pair<const int, const sptr<IAccessibilityElementOperatorCallback>>(requestId, callback));
-    std::shared_ptr<AccessibilityElementOperator> obj =
-        AccessibilitySystemAbilityClient::GetInstance()->GetOperatorObject(GetWindowId());
+    std::shared_ptr<AccessibilityElementOperator> obj = instance->GetOperatorObject(GetWindowId());
     if (obj != nullptr) {
         obj->SearchElementInfosByText(elementId, text, requestId, *tempCallback);
     } else {
@@ -229,13 +237,17 @@ void AccessibilityElementOperatorStub::FindFocusedElementInfo(const long element
     const sptr<IAccessibilityElementOperatorCallback> &callback)
 {
     HILOG_DEBUG("start");
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        HILOG_ERROR("instance is nullptr");
+        return;
+    }
     AccessibilityElementOperatorCallback *tempCallback = new CallbackImpl(requestId,
         CallbackImpl::CALLBACK_FIND_FOCUS);
     std::lock_guard<std::recursive_mutex> lock(mutex_);
     aaCallbacks_.insert(
         std::pair<const int, const sptr<IAccessibilityElementOperatorCallback>>(requestId, callback));
-    std::shared_ptr<AccessibilityElementOperator> obj =
-        AccessibilitySystemAbilityClient::GetInstance()->GetOperatorObject(GetWindowId());
+    std::shared_ptr<AccessibilityElementOperator> obj = instance->GetOperatorObject(GetWindowId());
     if (obj != nullptr) {
         obj->FindFocusedElementInfo(elementId, focusType, requestId, *tempCallback);
     } else {
@@ -248,13 +260,17 @@ void AccessibilityElementOperatorStub::FocusMoveSearch(const long elementId,
     const sptr<IAccessibilityElementOperatorCallback> &callback)
 {
     HILOG_DEBUG("start");
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        HILOG_ERROR("instance is nullptr");
+        return;
+    }
     AccessibilityElementOperatorCallback *tempCallback = new CallbackImpl(requestId,
         CallbackImpl::CALLBACK_BY_FOCUS_MOVE);
     std::lock_guard<std::recursive_mutex> lock(mutex_);
     aaCallbacks_.insert(
         std::pair<const int, const sptr<IAccessibilityElementOperatorCallback>>(requestId, callback));
-    std::shared_ptr<AccessibilityElementOperator> obj =
-        AccessibilitySystemAbilityClient::GetInstance()->GetOperatorObject(GetWindowId());
+    std::shared_ptr<AccessibilityElementOperator> obj = instance->GetOperatorObject(GetWindowId());
     if (obj != nullptr) {
         obj->FocusMoveSearch(elementId, direction, requestId, *tempCallback);
     } else {
@@ -267,13 +283,17 @@ void AccessibilityElementOperatorStub::ExecuteAction(const long elementId,
     int requestId, const sptr<IAccessibilityElementOperatorCallback> &callback)
 {
     HILOG_DEBUG("start");
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        HILOG_ERROR("instance is nullptr");
+        return;
+    }
     AccessibilityElementOperatorCallback *tempCallback = new CallbackImpl(requestId,
         CallbackImpl::CALLBACK_PERFORM_ACTION);
     std::lock_guard<std::recursive_mutex> lock(mutex_);
     aaCallbacks_.insert(
         std::pair<const int, const sptr<IAccessibilityElementOperatorCallback>>(requestId, callback));
-    std::shared_ptr<AccessibilityElementOperator> obj =
-        AccessibilitySystemAbilityClient::GetInstance()->GetOperatorObject(GetWindowId());
+    std::shared_ptr<AccessibilityElementOperator> obj = instance->GetOperatorObject(GetWindowId());
     if (obj != nullptr) {
         obj->ExecuteAction(elementId, action, actionArguments, requestId, *tempCallback);
     } else {
@@ -284,8 +304,12 @@ void AccessibilityElementOperatorStub::ExecuteAction(const long elementId,
 void AccessibilityElementOperatorStub::ClearFocus()
 {
     HILOG_DEBUG("start");
-    std::shared_ptr<AccessibilityElementOperator> obj =
-        AccessibilitySystemAbilityClient::GetInstance()->GetOperatorObject(GetWindowId());
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        HILOG_ERROR("instance is nullptr");
+        return;
+    }
+    std::shared_ptr<AccessibilityElementOperator> obj = instance->GetOperatorObject(GetWindowId());
     if (obj != nullptr) {
         obj->ClearFocus();
     } else {
@@ -296,8 +320,12 @@ void AccessibilityElementOperatorStub::ClearFocus()
 void AccessibilityElementOperatorStub::OutsideTouch()
 {
     HILOG_DEBUG("start");
-    std::shared_ptr<AccessibilityElementOperator> obj =
-        AccessibilitySystemAbilityClient::GetInstance()->GetOperatorObject(GetWindowId());
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        HILOG_ERROR("instance is nullptr");
+        return;
+    }
+    std::shared_ptr<AccessibilityElementOperator> obj = instance->GetOperatorObject(GetWindowId());
     if (obj != nullptr) {
         obj->OutsideTouch();
     } else {

frameworks/asacfwk/src/accessibility_operator.cpp

@@ -94,9 +94,14 @@ void AccessibilityOperator::RemoveChannel(int channelId)
 
 bool AccessibilityOperator::GetRoot(int channelId, AccessibilityElementInfo &elementInfo)
 {
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        HILOG_ERROR("instance is nullptr");
+        return false;
+    }
     AccessibilityElementInfo element {};
     std::vector<AccessibilityElementInfo> elementInfos {};
-    int activeWindow = AccessibilitySystemAbilityClient::GetInstance()->GetActiveWindow();
+    int activeWindow = instance->GetActiveWindow();
     HILOG_DEBUG("activeWindow is %{public}d", activeWindow);
     bool result = SearchElementInfosByAccessibilityId(channelId, activeWindow, NONE_ID, 0, elementInfos);
     HILOG_DEBUG("element [elementSize:%{public}d]", elementInfos.size());

frameworks/asacfwk/src/accessibility_system_ability_client.cpp

@@ -42,7 +42,12 @@ struct AccessibilitySystemAbilityClient::Impl {
 
         void OnRemoteDied(const wptr<IRemoteObject>& remote)
         {
-            AccessibilitySystemAbilityClient::GetInstance()->ResetService(remote);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (!instance) {
+                HILOG_ERROR("instance is nullptr");
+                return;
+            }
+            instance->ResetService(remote);
         }
     };
     sptr<IRemoteObject::DeathRecipient> deathRecipient_ = nullptr;

frameworks/asacfwk/src/accessibility_window_info.cpp

@@ -19,7 +19,6 @@
 
 namespace OHOS {
 namespace Accessibility {
-/* AccessibleAction     Parcel struct                   */
 bool AccessibilityWindowInfo::ReadFromParcel(Parcel &parcel)
 {
     int windowType = TYPE_WINDOW_INVALID;

frameworks/asacfwk/src/accessible_ability_manager_service_proxy.cpp

@@ -222,7 +222,6 @@ std::vector<AccessibilityAbilityInfo> AccessibleAbilityManagerServiceClientProxy
         HILOG_ERROR("GetAbilityList fail");
         return errorList;
     }
-    // read result
     int32_t abilityInfoSize = reply.ReadInt32();
     for (int i = 0; i < abilityInfoSize; i++) {
         std::shared_ptr<AccessibilityAbilityInfo> accessibilityAbilityInfo(

frameworks/asacfwk/test/unittest/accessible_ability_manager_service_state_stub_test.cpp

@@ -85,7 +85,6 @@ HWTEST_F(ASACStateStubUnitTest, OnRemoteRequest_001, TestSize.Level1)
 HWTEST_F(ASACStateStubUnitTest, OnRemoteRequest_002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "OnRemoteRequest_002 start";
-    // set descriptor
     MessageParcel data;
     MessageParcel reply;
     MessageOption option;

frameworks/asacfwk/test/unittest/accessible_ability_manager_service_stub_test.cpp

@@ -73,7 +73,7 @@ HWTEST_F(ASACStubUnitTest, OnRemoteRequest_001, TestSize.Level1)
         data, reply, option);
     EXPECT_EQ(res, OHOS::Accessibility::ERR_INVALID_STATE);
 
-    // set descriptor
+    // Set descriptor
     WriteInterfaceToken(data);
     res = mockStub_->OnRemoteRequest(
         static_cast<uint32_t>(IAccessibleAbilityManagerServiceClient::Message::SEND_EVENT), data, reply, option);
@@ -94,7 +94,7 @@ HWTEST_F(ASACStubUnitTest, OnRemoteRequest_002, TestSize.Level1)
         data, reply, option);
     EXPECT_EQ(res, OHOS::Accessibility::ERR_INVALID_STATE);
 
-    // set descriptor
+    // Set descriptor
     WriteInterfaceToken(data);
     res = mockStub_->OnRemoteRequest(
         static_cast<uint32_t>(IAccessibleAbilityManagerServiceClient::Message::REGISTER_STATE_CALLBACK),
@@ -121,7 +121,7 @@ HWTEST_F(ASACStubUnitTest, OnRemoteRequest_003, TestSize.Level1)
         data, reply, option);
     EXPECT_EQ(res, OHOS::Accessibility::ERR_INVALID_STATE);
 
-    // set descriptor
+    // Set descriptor
     WriteInterfaceToken(data);
     res = mockStub_->OnRemoteRequest(
         static_cast<uint32_t>(IAccessibleAbilityManagerServiceClient::Message::GET_ABILITYLIST),
@@ -148,7 +148,7 @@ HWTEST_F(ASACStubUnitTest, OnRemoteRequest_004, TestSize.Level1)
         data, reply, option);
     EXPECT_EQ(res, OHOS::Accessibility::ERR_INVALID_STATE);
 
-    // set descriptor
+    // Set descriptor
     WriteInterfaceToken(data);
     res = mockStub_->OnRemoteRequest(
         static_cast<uint32_t>(IAccessibleAbilityManagerServiceClient::Message::REGISTER_INTERACTION_CONNECTION),
@@ -175,7 +175,7 @@ HWTEST_F(ASACStubUnitTest, OnRemoteRequest_005, TestSize.Level1)
         data, reply, option);
     EXPECT_EQ(res, OHOS::Accessibility::ERR_INVALID_STATE);
 
-    // set descriptor
+    // Set descriptor
     WriteInterfaceToken(data);
     res = mockStub_->OnRemoteRequest(
         static_cast<uint32_t>(IAccessibleAbilityManagerServiceClient::Message::DEREGISTER_INTERACTION_CONNECTION),

interfaces/innerkits/asacfwk/include/accessibility_caption.h

@@ -94,7 +94,7 @@ private:
     bool HasWindowColor();
 
     std::string fontFamily_ = "default";
-    int fontScale_ = 75;    // font size
+    int fontScale_ = 75;
     uint32_t fontColor_ = 0xff000000;
     std::string fontEdgeType_ = "none";
     uint32_t backgroundColor_ = 0xff000000;

interfaces/innerkits/asacfwk/include/accessibility_element_info.h

@@ -53,7 +53,7 @@ enum ActionType :int {
     ACCESSIBILITY_ACTION_TYPE_MASK = 0x1FFFFFFF,
 };
 
-// text move step
+// Text move step
 enum TextMoveUnit : int {
     STEP_INVALID = 0,
     STEP_CHARACTER = 0x00000001,
@@ -63,7 +63,7 @@ enum TextMoveUnit : int {
     STEP_PARAGRAPH = 0x00000010,
 };
 
-// text move step
+// Text move step
 extern const std::string MOVE_UNIT_CHARACTER;
 extern const std::string MOVE_UNIT_WORD;
 extern const std::string MOVE_UNIT_LINE;
@@ -131,7 +131,7 @@ static const int FOCUS_TYPE_INVALID = -1;
 static const int FOCUS_TYPE_INPUT = 1 << 0;
 static const int FOCUS_TYPE_ACCESSIBILITY = 1 << 1;
 
-// grid mode
+// Grid mode
 static const int SELECTION_MODE_NONE = 0;
 static const int SELECTION_MODE_SINGLE = 1;
 static const int SELECTION_MODE_MULTIPLE = 2;
@@ -1801,7 +1801,7 @@ private:
     int childCount_ = 0;
     std::vector<AccessibleAction> operations_;
     int textLengthLimit_ = -1;
-    int channelId_ = UNDEFINED_CHANNEL_ID; // rename
+    int channelId_ = UNDEFINED_CHANNEL_ID;
     Rect bounds_ {};
     bool accessibilityGroup_ = false;
     bool checkable_ = false;
@@ -1834,7 +1834,7 @@ private:
     int labeled_ = 0;
     int beginSelected_ = 0;
     int endSelected_ = 0;
-    int inputType_ = 0; // text input type added
+    int inputType_ = 0; // Text input type added
     bool validElement_ = true;
 };
 } // namespace Accessibility

interfaces/innerkits/asacfwk/include/accessibility_event_info.h

@@ -497,7 +497,7 @@ public:
      * @since 3
      * @sysCap Accessibility
      */
-    AccessibilityEventInfo GetRecord(const int index);    // remained
+    AccessibilityEventInfo GetRecord(const int index);    // Remained
 
     /**
      * @brief Gets the accessibility record list.
@@ -580,7 +580,7 @@ public:
      * @since 3
      * @sysCap Accessibility
      */
-    void SetTimeStamp(const int64_t eventTime);  // remained:for send event timestamp
+    void SetTimeStamp(const int64_t eventTime);  // Remained:for send event timestamp
 
     /**
      * @brief Gets the bundle name of the event source, that is, the bundle name of the target application.

interfaces/kits/napi/include/napi_accessibility_system_ability_client.h

@@ -171,9 +171,9 @@ public:
     static napi_value GetCaptionWindowColor(napi_env env, napi_callback_info info);
     static napi_value SetCaptionWindowColor(napi_env env, napi_callback_info info);
 
-    static napi_value aaCons_;          // CaptionsManager
+    static napi_value aaCons_; // CaptionsManager
     static napi_ref aaConsRef_;
-    static napi_value aaStyleCons_;  // CaptionsStyle
+    static napi_value aaStyleCons_; // CaptionsStyle
     static napi_ref aaStyleConsRef_;
 
     static std::map<std::string, std::vector<std::shared_ptr<StateListener>>> stateListeners_;

interfaces/kits/napi/src/napi_accessibility_info.cpp

@@ -174,12 +174,12 @@ napi_value NElementInfo::GetByContent(napi_env env, napi_callback_info info)
 
     napi_create_async_work(
         env, nullptr, resource,
-        [](napi_env env, void* data) {  // execute async to call c++ function
+        [](napi_env env, void* data) { // Execute async to call c++ function
             NAccessibilityInfoData *callbackInfo = (NAccessibilityInfoData*)data;
             AccessibilityElementInfo nodeInfo = callbackInfo->nativeNodeInfo_;
             callbackInfo->ret_ = nodeInfo.GetByContent(callbackInfo->content_, callbackInfo->nodeInfos_);
         },
-        [](napi_env env, napi_status status, void* data) {   // execute the complete function
+        [](napi_env env, napi_status status, void* data) { // Execute the complete function
             HILOG_DEBUG("execute back");
             NAccessibilityInfoData* callbackInfo = (NAccessibilityInfoData*)data;
             napi_value jsReturnValue = 0;
@@ -368,7 +368,7 @@ napi_value NElementInfo::GetNext(napi_env env, napi_callback_info info)
 
     napi_create_async_work(
         env, nullptr, resource,
-        [](napi_env env, void* data) {  // execute async to call c++ function
+        [](napi_env env, void* data) { // Execute async to call c++ function
             NAccessibilityInfoData *callbackInfo = (NAccessibilityInfoData*)data;
             AccessibilityElementInfo nodeInfo = callbackInfo->nativeNodeInfo_;
             if (callbackInfo->ret_) {
@@ -376,7 +376,7 @@ napi_value NElementInfo::GetNext(napi_env env, napi_callback_info info)
                     callbackInfo->nodeInfo_);
             }
         },
-        [](napi_env env, napi_status status, void* data) {  // execute the complete function
+        [](napi_env env, napi_status status, void* data) { // Execute the complete function
             HILOG_DEBUG("GetNext execute back");
             NAccessibilityInfoData* callbackInfo = (NAccessibilityInfoData*)data;
             napi_value jsReturnValue = 0;
@@ -453,12 +453,12 @@ napi_value NElementInfo::GetChild(napi_env env, napi_callback_info info)
 
     napi_create_async_work(
         env, nullptr, resource,
-        [](napi_env env, void* data) {  // execute async to call c++ function
+        [](napi_env env, void* data) { // Execute async to call c++ function
             NAccessibilityInfoData *callbackInfo = (NAccessibilityInfoData*)data;
             AccessibilityElementInfo nodeInfo = callbackInfo->nativeNodeInfo_;
             callbackInfo->ret_ = nodeInfo.GetChild(callbackInfo->childIndex_, callbackInfo->nodeInfo_);
         },
-        [](napi_env env, napi_status status, void* data) {  // execute the complete function
+        [](napi_env env, napi_status status, void* data) { // Execute the complete function
             HILOG_DEBUG("GetChild execute back");
             NAccessibilityInfoData* callbackInfo = (NAccessibilityInfoData*)data;
             napi_value jsReturnValue = 0;
@@ -532,12 +532,12 @@ napi_value NElementInfo::GetParent(napi_env env, napi_callback_info info)
 
     napi_create_async_work(
         env, nullptr, resource,
-        [](napi_env env, void* data) {  // execute async to call c++ function
+        [](napi_env env, void* data) { // execute async to call c++ function
             NAccessibilityInfoData *callbackInfo = (NAccessibilityInfoData*)data;
             AccessibilityElementInfo nodeInfo = callbackInfo->nativeNodeInfo_;
             callbackInfo->ret_ = nodeInfo.GetParent(callbackInfo->nodeInfo_);
         },
-        [](napi_env env, napi_status status, void* data) {  // execute the complete function
+        [](napi_env env, napi_status status, void* data) { // execute the complete function
             HILOG_DEBUG("GetParent execute back");
             NAccessibilityInfoData* callbackInfo = (NAccessibilityInfoData*)data;
             napi_value jsReturnValue = 0;

interfaces/kits/napi/src/napi_accessibility_system_ability_client.cpp

@@ -49,17 +49,17 @@ napi_value NAccessibilityClient::IsOpenAccessibility(napi_env env, napi_callback
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "IsOpenAccessibility", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->enabled_ = AccessibilitySystemAbilityClient::GetInstance()->IsEnabled();
-            HILOG_INFO("IsOpenAccessibility Executing enabled[%{public}d]", callbackInfo->enabled_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->enabled_ = instance->IsEnabled();
+                HILOG_INFO("IsOpenAccessibility Executing enabled[%{public}d]", callbackInfo->enabled_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -110,13 +110,16 @@ napi_value NAccessibilityClient::IsOpenTouchExploration(napi_env env, napi_callb
     napi_create_string_utf8(env, "IsOpenTouchExploration", NAPI_AUTO_LENGTH, &resource);
 
     napi_create_async_work(env, nullptr, resource,
-        // execute async to call c++ function
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->touchEnabled_ = AccessibilitySystemAbilityClient::GetInstance()->IsTouchExplorationEnabled();
-            HILOG_INFO("IsOpenTouchExploration Executing touchEnabled[%{public}d]", callbackInfo->touchEnabled_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->touchEnabled_ = instance->IsTouchExplorationEnabled();
+                HILOG_INFO("IsOpenTouchExploration Executing touchEnabled[%{public}d]", callbackInfo->touchEnabled_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -171,17 +174,17 @@ napi_value NAccessibilityClient::GetAbilityList(napi_env env, napi_callback_info
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "GetAbilityList", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->abilityList_ = AccessibilitySystemAbilityClient::GetInstance()->GetAbilityList(
-                callbackInfo->abilityTypes_, callbackInfo->stateTypes_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->abilityList_ = instance->GetAbilityList(
+                    callbackInfo->abilityTypes_, callbackInfo->stateTypes_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -231,15 +234,12 @@ napi_value NAccessibilityClient::SendEvent(napi_env env, napi_callback_info info
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "SendEvent", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
+    napi_create_async_work(env, nullptr, resource,
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            if (callbackInfo->result_) {
-                callbackInfo->result_ =
-                    AccessibilitySystemAbilityClient::GetInstance()->SendEvent(callbackInfo->eventInfo_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (callbackInfo->result_ && instance) {
+                callbackInfo->result_ = instance->SendEvent(callbackInfo->eventInfo_);
             }
             HILOG_INFO("SendEvent result[%{public}d]", callbackInfo->result_);
         },
@@ -303,7 +303,10 @@ napi_value NAccessibilityClient::SubscribeState(napi_env env, napi_callback_info
     stateListener->StartWork(env, 1, args);
 
     NAccessibilityClient::stateListeners_[eventType].push_back(stateListener);
-    AccessibilitySystemAbilityClient::GetInstance()->SubscribeStateObserver(stateListener, type);
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (instance) {
+        instance->SubscribeStateObserver(stateListener, type);
+    }
     return nullptr;
 }
 
@@ -329,9 +332,12 @@ napi_value NAccessibilityClient::UnsubscribeState(napi_env env, napi_callback_in
         it != NAccessibilityClient::stateListeners_[eventType].end();) {
         std::shared_ptr<StateListener> observer= *it;
         if (observer->GetEnv() == env) {
-            result = AccessibilitySystemAbilityClient::GetInstance()->UnsubscribeStateObserver(observer, type);
-            it = NAccessibilityClient::stateListeners_[eventType].erase(it);
-            HILOG_INFO("UnsubscribeState result%{public}d", result);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                result = instance->UnsubscribeStateObserver(observer, type);
+                it = NAccessibilityClient::stateListeners_[eventType].erase(it);
+                HILOG_INFO("UnsubscribeState result%{public}d", result);
+            }
         } else {
             it++;
         }
@@ -416,16 +422,16 @@ napi_value NAccessibilityClient::GetCaptionProperty(napi_env env, napi_callback_
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "GetCaptionProperty", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->captionProperty_ = AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->captionProperty_ = instance->GetCaptionProperty();
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -475,17 +481,17 @@ napi_value NAccessibilityClient::SetCaptionProperty(napi_env env, napi_callback_
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "SetCaptionProperty", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->setCaptionPropertyReturn_ = AccessibilitySystemAbilityClient::GetInstance()
-                ->SetCaptionPropertyTojson(callbackInfo->captionProperty_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->setCaptionPropertyReturn_ = instance->SetCaptionPropertyTojson(
+                    callbackInfo->captionProperty_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -536,16 +542,16 @@ napi_value NAccessibilityClient::GetCaptionState(napi_env env, napi_callback_inf
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "GetCaptionState", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->captionState_ = AccessibilitySystemAbilityClient::GetInstance()->GetCaptionState();
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->captionState_ = instance->GetCaptionState();
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -596,13 +602,15 @@ napi_value NAccessibilityClient::SetCaptionState(napi_env env, napi_callback_inf
     napi_create_string_utf8(env, "SetCaptionState", NAPI_AUTO_LENGTH, &resource);
 
     napi_create_async_work(env, nullptr, resource,
-        // execute async to call c++ function
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->setCaptionStateReturn_ =
-                AccessibilitySystemAbilityClient::GetInstance()->SetCaptionStateTojson(callbackInfo->captionState_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->setCaptionStateReturn_ = instance->SetCaptionStateTojson(callbackInfo->captionState_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -654,16 +662,16 @@ napi_value NAccessibilityClient::GetEnabled(napi_env env, napi_callback_info inf
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "GetEnabled", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->enabledState_ = AccessibilitySystemAbilityClient::GetInstance()->GetEnabledState();
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->enabledState_ = instance->GetEnabledState();
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -713,17 +721,16 @@ napi_value NAccessibilityClient::SetEnabled(napi_env env, napi_callback_info inf
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "SetEnabled", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->setEnabledReturn_ =
-                AccessibilitySystemAbilityClient::GetInstance()->SetEnabled(callbackInfo->enabledState_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->setEnabledReturn_ = instance->SetEnabled(callbackInfo->enabledState_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -774,16 +781,16 @@ napi_value NAccessibilityClient::GetTouchGuideState(napi_env env, napi_callback_
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "GetTouchGuideState", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->touchGuideState_ = AccessibilitySystemAbilityClient::GetInstance()->GetTouchGuideState();
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->touchGuideState_ = instance->GetTouchGuideState();
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -833,17 +840,16 @@ napi_value NAccessibilityClient::SetTouchGuideState(napi_env env, napi_callback_
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "SetTouchGuideState", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->setTouchGuideStateReturn_ =
-                AccessibilitySystemAbilityClient::GetInstance()->SetTouchGuideState(callbackInfo->touchGuideState_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->setTouchGuideStateReturn_ = instance->SetTouchGuideState(callbackInfo->touchGuideState_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -894,16 +900,16 @@ napi_value NAccessibilityClient::GetGestureState(napi_env env, napi_callback_inf
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "GetGestureState", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->gestureState_ = AccessibilitySystemAbilityClient::GetInstance()->GetGestureState();
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->gestureState_ = instance->GetGestureState();
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -953,17 +959,16 @@ napi_value NAccessibilityClient::SetGestureState(napi_env env, napi_callback_inf
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "SetGestureState", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->setGestureStateReturn_ =
-                AccessibilitySystemAbilityClient::GetInstance()->SetGestureState(callbackInfo->gestureState_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->setGestureStateReturn_ = instance->SetGestureState(callbackInfo->gestureState_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -1014,17 +1019,16 @@ napi_value NAccessibilityClient::GetKeyEventObserverState(napi_env env, napi_cal
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "GetKeyEventObserverState", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->keyEventObserverState_ =
-                AccessibilitySystemAbilityClient::GetInstance()->GetKeyEventObserverState();
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->keyEventObserverState_ = instance->GetKeyEventObserverState();
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -1074,17 +1078,17 @@ napi_value NAccessibilityClient::SetKeyEventObserverState(napi_env env, napi_cal
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "SetKeyEventObserverState", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->setKeyEvenReturn_ = AccessibilitySystemAbilityClient::GetInstance()->SetKeyEventObserverState(
-                callbackInfo->keyEventObserverState_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->setKeyEvenReturn_ = instance->SetKeyEventObserverState(
+                    callbackInfo->keyEventObserverState_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -1136,14 +1140,16 @@ napi_value NAccessibilityClient::GetInstalled(napi_env env, napi_callback_info i
     napi_create_string_utf8(env, "GetInstalled", NAPI_AUTO_LENGTH, &resource);
 
     napi_create_async_work(env, nullptr, resource,
-        // execute async to call c++ function
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->abilityList_ = AccessibilitySystemAbilityClient::GetInstance()->GetInstalledAbilities();
-
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->abilityList_ = instance->GetInstalledAbilities();
+            }
             HILOG_INFO("GetInstalled Executing GetInstalled[%{public}d]", callbackInfo->abilityList_.size());
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -1192,19 +1198,18 @@ napi_value NAccessibilityClient::GetExtensionEnabled(napi_env env, napi_callback
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "GetExtensionEnabled", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->enabledAbilities_ = AccessibilitySystemAbilityClient::GetInstance()->GetEnabledAbilities();
-
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->enabledAbilities_ = instance->GetEnabledAbilities();
+            }
             HILOG_INFO("GetExtensionEnabled Executing GetExtensionEnabled[%{public}d]",
                 callbackInfo->enabledAbilities_.size());
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -1254,17 +1259,16 @@ napi_value NAccessibilityClient::ExtensionEnabled(napi_env env, napi_callback_in
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "ExtensionEnabled", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->setExtensionReturn_ =
-                AccessibilitySystemAbilityClient::GetInstance()->SetEnabledObj(callbackInfo->enabledAbilities_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->setExtensionReturn_ = instance->SetEnabledObj(callbackInfo->enabledAbilities_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -1314,17 +1318,16 @@ napi_value NAccessibilityClient::ExtensionDisabled(napi_env env, napi_callback_i
     napi_value resource = nullptr;
     napi_create_string_utf8(env, "ExtensionDisabled", NAPI_AUTO_LENGTH, &resource);
 
-    napi_create_async_work(
-        env,
-        nullptr,
-        resource,
-        // execute async to call c++ function
+    napi_create_async_work(env, nullptr, resource,
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
-            callbackInfo->setExtensionReturn_ =
-                AccessibilitySystemAbilityClient::GetInstance()->DisableAbilities(callbackInfo->enabledAbilities_);
+            auto instance = AccessibilitySystemAbilityClient::GetInstance();
+            if (instance) {
+                callbackInfo->setExtensionReturn_ = instance->DisableAbilities(callbackInfo->enabledAbilities_);
+            }
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             NAccessibilitySystemAbilityClient* callbackInfo = (NAccessibilitySystemAbilityClient*)data;
             napi_value result[ARGS_SIZE_TWO] = {0};
@@ -1392,8 +1395,12 @@ napi_value NAccessibilityClient::GetCaptionsManager(napi_env env, napi_callback_
     NAccessibilitySystemAbilityClient* callbackInfo = new NAccessibilitySystemAbilityClient();
     napi_value result = 0;
 
-    callbackInfo->captionState_ = AccessibilitySystemAbilityClient::GetInstance()->GetCaptionState();
-    callbackInfo->captionProperty_ = AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        return result;
+    }
+    callbackInfo->captionState_ = instance->GetCaptionState();
+    callbackInfo->captionProperty_ = instance->GetCaptionProperty();
 
     napi_get_reference_value(env, NAccessibilityClient::aaConsRef_,
                              &NAccessibilityClient::aaCons_);
@@ -1426,8 +1433,11 @@ napi_value NAccessibilityClient::SetCaptionStateEnabled(napi_env env, napi_callb
         napi_get_value_bool(env, parameters[PARAM0], &captionState);
         HILOG_INFO("captionState = %{public}s", captionState?"True":"False");
 
-        bool returnVal = AccessibilitySystemAbilityClient::GetInstance()->SetCaptionStateTojson(captionState);
-        HILOG_INFO("SetCaptionPropertyTojson() return = %{public}s", returnVal ? "True" : "False");
+        auto instance = AccessibilitySystemAbilityClient::GetInstance();
+        if (instance) {
+            bool returnVal = instance->SetCaptionStateTojson(captionState);
+            HILOG_INFO("SetCaptionPropertyTojson() return = %{public}s", returnVal ? "True" : "False");
+        }
     } else {
         HILOG_INFO("argc size Error");
     }
@@ -1442,7 +1452,11 @@ napi_value NAccessibilityClient::GetCaptionStateEnabled(napi_env env, napi_callb
     HILOG_INFO("start");
     napi_value captionStateEnabled = nullptr;
 
-    bool captionState = AccessibilitySystemAbilityClient::GetInstance()->GetCaptionState();
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        return captionStateEnabled;
+    }
+    bool captionState = instance->GetCaptionState();
     napi_get_boolean(env, captionState, &captionStateEnabled);
 
     HILOG_INFO("captionState = %{public}s", captionState ? "True" : "False");
@@ -1459,8 +1473,11 @@ napi_value NAccessibilityClient::SetCaptionStyle(napi_env env, napi_callback_inf
     napi_get_cb_info(env, info, &argc, parameters, nullptr, nullptr);
     if (argc >= ARGS_SIZE_ONE) {
         ConvertObjToCaptionProperty(env, parameters[PARAM0], &captionProperty);
-        bool returnVal = AccessibilitySystemAbilityClient::GetInstance()->SetCaptionPropertyTojson(captionProperty);
-        HILOG_INFO("SetCaptionPropertyTojson() return = %{public}s", returnVal ? "True" : "False");
+        auto instance = AccessibilitySystemAbilityClient::GetInstance();
+        if (instance) {
+            bool returnVal = instance->SetCaptionPropertyTojson(captionProperty);
+            HILOG_INFO("SetCaptionPropertyTojson() return = %{public}s", returnVal ? "True" : "False");
+        }
     } else {
         HILOG_INFO("argc size Error");
     }
@@ -1477,7 +1494,11 @@ napi_value NAccessibilityClient::GetCaptionStyle(napi_env env, napi_callback_inf
     OHOS::Accessibility::CaptionProperty captionProperty {};
     napi_value captionStyle = nullptr;
 
-    captionProperty = AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        return captionStyle;
+    }
+    captionProperty = instance->GetCaptionProperty();
 
     napi_get_reference_value(env, NAccessibilityClient::aaStyleConsRef_,
                              &NAccessibilityClient::aaStyleCons_);
@@ -1514,7 +1535,10 @@ napi_value NAccessibilityClient::RegisterCaptionStateCallback(napi_env env, napi
     captionListener->StartWork(env, 1, args);
     NAccessibilityClient::captionListeners_.push_back(captionListener);
 
-    AccessibilitySystemAbilityClient::GetInstance()->AddCaptionListener(captionListener, type);
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (instance) {
+        instance->AddCaptionListener(captionListener, type);
+    }
 
     return nullptr;
 }
@@ -1540,9 +1564,9 @@ napi_value NAccessibilityClient::DeregisterCaptionStateCallback(napi_env env, na
     for (auto it = NAccessibilityClient::captionListeners_.begin();
         it != NAccessibilityClient::captionListeners_.end();) {
         std::shared_ptr<CaptionListener> observer= *it;
-        if (observer->GetEnv() == env && !strcmp(observer->GetEventType().c_str(), eventType.c_str())) {
-            retValue = retValue &&
-                AccessibilitySystemAbilityClient::GetInstance()->DeleteCaptionListener(observer, type);
+        auto instance = AccessibilitySystemAbilityClient::GetInstance();
+        if (instance && observer->GetEnv() == env && !strcmp(observer->GetEventType().c_str(), eventType.c_str())) {
+            retValue = retValue && instance->DeleteCaptionListener(observer, type);
             it = NAccessibilityClient::captionListeners_.erase(it);
             HILOG_INFO("unregister result%{public}d", retValue);
         } else {
@@ -1691,9 +1715,12 @@ napi_value NAccessibilityClient::AccessibleAbilityConstructorStyle(napi_env env,
 napi_value NAccessibilityClient::GetCaptionsFontFamily(napi_env env, napi_callback_info info)
 {
     HILOG_INFO("start");
-    OHOS::Accessibility::CaptionProperty captionProperty =
-        AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
     napi_value returnValue = nullptr;
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        return returnValue;
+    }
+    OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
     napi_create_string_utf8(env, captionProperty.GetFontFamily().c_str(), NAPI_AUTO_LENGTH, &returnValue);
     HILOG_INFO("end");
     return returnValue;
@@ -1707,17 +1734,19 @@ napi_value NAccessibilityClient::SetCaptionsFontFamily(napi_env env, napi_callba
     napi_get_cb_info(env, info, &argc, parameters, nullptr, nullptr);
     if (argc >= ARGS_SIZE_ONE) {
         bool returnVal = false;
-        // get input FontFamily
+        // Get input FontFamily
         char outBuffer[CHAE_BUFFER_MAX + 1] = {0};
         size_t outSize = 0;
         napi_get_value_string_utf8(env, parameters[PARAM0], outBuffer, CHAE_BUFFER_MAX, &outSize);
         HILOG_INFO("FontFamily = %{public}s", outBuffer);
-        // get CaptionProperty
-        OHOS::Accessibility::CaptionProperty captionProperty =
-            AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
-        // change the input info and then set the CaptionProperty
-        captionProperty.SetFontFamily(std::string(outBuffer));
-        returnVal = AccessibilitySystemAbilityClient::GetInstance()->SetCaptionPropertyTojson(captionProperty);
+        // Get CaptionProperty
+        auto instance = AccessibilitySystemAbilityClient::GetInstance();
+        if (instance) {
+            OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
+            // Change the input info and then set the CaptionProperty
+            captionProperty.SetFontFamily(std::string(outBuffer));
+            returnVal = instance->SetCaptionPropertyTojson(captionProperty);
+        }
         HILOG_INFO("SetCaptionPropertyTojson() return = %{public}s", returnVal ? "True" : "False");
     } else {
         HILOG_INFO("argc size Error");
@@ -1730,9 +1759,12 @@ napi_value NAccessibilityClient::SetCaptionsFontFamily(napi_env env, napi_callba
 napi_value NAccessibilityClient::GetCaptionsFontScale(napi_env env, napi_callback_info info)
 {
     HILOG_INFO("start");
-    OHOS::Accessibility::CaptionProperty captionProperty =
-        AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
     napi_value returnValue = nullptr;
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        return returnValue;
+    }
+    OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
     napi_create_int32(env, captionProperty.GetFontScale(), &returnValue);
     HILOG_INFO("end");
     return returnValue;
@@ -1746,16 +1778,18 @@ napi_value NAccessibilityClient::SetCaptionsFontScale(napi_env env, napi_callbac
     napi_get_cb_info(env, info, &argc, parameters, nullptr, nullptr);
     if (argc >= ARGS_SIZE_ONE) {
         bool returnVal = false;
-        // get input FontScale
+        // Get input FontScale
         int32_t num = 0;
         napi_get_value_int32(env, parameters[PARAM0], &num);
         HILOG_INFO("FontScale = %{public}d", num);
-        // get CaptionProperty
-        OHOS::Accessibility::CaptionProperty captionProperty =
-            AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
-        // change the input info and then set the CaptionProperty
-        captionProperty.SetFontScale(num);
-        returnVal = AccessibilitySystemAbilityClient::GetInstance()->SetCaptionPropertyTojson(captionProperty);
+        // Get CaptionProperty
+        auto instance = AccessibilitySystemAbilityClient::GetInstance();
+        if (instance) {
+        OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
+            // Change the input info and then set the CaptionProperty
+            captionProperty.SetFontScale(num);
+            returnVal = instance->SetCaptionPropertyTojson(captionProperty);
+        }
 
         HILOG_INFO("SetCaptionPropertyTojson() return = %{public}s", returnVal ? "True" : "False");
     } else {
@@ -1769,9 +1803,12 @@ napi_value NAccessibilityClient::SetCaptionsFontScale(napi_env env, napi_callbac
 napi_value NAccessibilityClient::GetCaptionFrontColor(napi_env env, napi_callback_info info)
 {
     HILOG_INFO("start");
-    OHOS::Accessibility::CaptionProperty captionProperty =
-        AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
     napi_value returnValue = nullptr;
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        return returnValue;
+    }
+    OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
     uint32_t color = captionProperty.GetFontColor();
     std::string colorStr = ConvertColorToString(color);
     napi_create_string_utf8(env, colorStr.c_str(), NAPI_AUTO_LENGTH, &returnValue);
@@ -1788,12 +1825,14 @@ napi_value NAccessibilityClient::SetCaptionFrontColor(napi_env env, napi_callbac
     if (argc >= ARGS_SIZE_ONE) {
         bool returnVal = false;
         uint32_t color = GetColorValue(env, parameters[PARAM0]);
-        // get CaptionProperty
-        OHOS::Accessibility::CaptionProperty captionProperty =
-            AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
-        // change the input info and then set the CaptionProperty
-        captionProperty.SetFontColor(color);
-        returnVal = AccessibilitySystemAbilityClient::GetInstance()->SetCaptionPropertyTojson(captionProperty);
+        // Get CaptionProperty
+        auto instance = AccessibilitySystemAbilityClient::GetInstance();
+        if (instance) {
+            OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
+            // Change the input info and then set the CaptionProperty
+            captionProperty.SetFontColor(color);
+            returnVal = instance->SetCaptionPropertyTojson(captionProperty);
+        }
     } else {
         HILOG_INFO("argc size Error");
     }
@@ -1805,9 +1844,12 @@ napi_value NAccessibilityClient::SetCaptionFrontColor(napi_env env, napi_callbac
 napi_value NAccessibilityClient::GetCaptionFontEdgeType(napi_env env, napi_callback_info info)
 {
     HILOG_INFO("start");
-    OHOS::Accessibility::CaptionProperty captionProperty =
-        AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
     napi_value returnValue = nullptr;
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        return returnValue;
+    }
+    OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
     napi_create_string_utf8(env, captionProperty.GetFontEdgeType().c_str(), NAPI_AUTO_LENGTH, &returnValue);
     HILOG_INFO("end");
     return returnValue;
@@ -1822,17 +1864,19 @@ napi_value NAccessibilityClient::SetCaptionFontEdgeType(napi_env env, napi_callb
     napi_get_cb_info(env, info, &argc, parameters, nullptr, nullptr);
     if (argc >= ARGS_SIZE_ONE) {
         bool returnVal = false;
-        // get input FontEdgeType
+        // Get input FontEdgeType
         char outBuffer[CHAE_BUFFER_MAX + 1] = {0};
         size_t outSize = 0;
         napi_get_value_string_utf8(env, parameters[PARAM0], outBuffer, CHAE_BUFFER_MAX, &outSize);
         HILOG_INFO("FontEdgeType = %{public}s", outBuffer);
-        // get CaptionProperty
-        OHOS::Accessibility::CaptionProperty captionProperty =
-            AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
-        // change the input info and then set the CaptionProperty
-        captionProperty.SetFontEdgeType(std::string(outBuffer));
-        returnVal = AccessibilitySystemAbilityClient::GetInstance()->SetCaptionPropertyTojson(captionProperty);
+        // Get CaptionProperty
+        auto instance = AccessibilitySystemAbilityClient::GetInstance();
+        if (instance) {
+            OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
+            // Change the input info and then set the CaptionProperty
+            captionProperty.SetFontEdgeType(std::string(outBuffer));
+            returnVal = instance->SetCaptionPropertyTojson(captionProperty);
+        }
         HILOG_INFO("SetCaptionPropertyTojson() return = %{public}s", returnVal ? "True" : "False");
     } else {
         HILOG_INFO("argc size Error");
@@ -1845,9 +1889,12 @@ napi_value NAccessibilityClient::SetCaptionFontEdgeType(napi_env env, napi_callb
 napi_value NAccessibilityClient::GetCaptionBackgroundColor(napi_env env, napi_callback_info info)
 {
     HILOG_INFO("start");
-    OHOS::Accessibility::CaptionProperty captionProperty =
-        AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
     napi_value returnValue = nullptr;
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        return returnValue;
+    }
+    OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
     uint32_t color = captionProperty.GetBackgroundColor();
     std::string colorStr = ConvertColorToString(color);
     napi_create_string_utf8(env, colorStr.c_str(), NAPI_AUTO_LENGTH, &returnValue);
@@ -1864,12 +1911,14 @@ napi_value NAccessibilityClient::SetCaptionBackgroundColor(napi_env env, napi_ca
     if (argc >= ARGS_SIZE_ONE) {
         bool returnVal = false;
         uint32_t color = GetColorValue(env, parameters[PARAM0]);
-        // get CaptionProperty
-        OHOS::Accessibility::CaptionProperty captionProperty =
-            AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
-        // change the input info and then set the CaptionProperty
-        captionProperty.SetBackgroundColor(color);
-        returnVal = AccessibilitySystemAbilityClient::GetInstance()->SetCaptionPropertyTojson(captionProperty);
+        // Get CaptionProperty
+        auto instance = AccessibilitySystemAbilityClient::GetInstance();
+        if (instance) {
+            OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
+            // Change the input info and then set the CaptionProperty
+            captionProperty.SetBackgroundColor(color);
+            returnVal = instance->SetCaptionPropertyTojson(captionProperty);
+        }
     } else {
         HILOG_INFO("argc size Error");
     }
@@ -1881,9 +1930,12 @@ napi_value NAccessibilityClient::SetCaptionBackgroundColor(napi_env env, napi_ca
 napi_value NAccessibilityClient::GetCaptionWindowColor(napi_env env, napi_callback_info info)
 {
     HILOG_INFO("start");
-    OHOS::Accessibility::CaptionProperty captionProperty =
-        AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
     napi_value returnValue = nullptr;
+    auto instance = AccessibilitySystemAbilityClient::GetInstance();
+    if (!instance) {
+        return returnValue;
+    }
+    OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
     uint32_t color = captionProperty.GetWindowColor();
     std::string colorStr = ConvertColorToString(color);
     napi_create_string_utf8(env, colorStr.c_str(), NAPI_AUTO_LENGTH, &returnValue);
@@ -1900,12 +1952,14 @@ napi_value NAccessibilityClient::SetCaptionWindowColor(napi_env env, napi_callba
     if (argc >= ARGS_SIZE_ONE) {
         bool returnVal = false;
         uint32_t color = GetColorValue(env, parameters[PARAM0]);
-        // get CaptionProperty
-        OHOS::Accessibility::CaptionProperty captionProperty =
-            AccessibilitySystemAbilityClient::GetInstance()->GetCaptionProperty();
-        // change the input info and then set the CaptionProperty
-        captionProperty.SetWindowColor(color);
-        returnVal = AccessibilitySystemAbilityClient::GetInstance()->SetCaptionPropertyTojson(captionProperty);
+        // Get CaptionProperty
+        auto instance = AccessibilitySystemAbilityClient::GetInstance();
+        if (instance) {
+            OHOS::Accessibility::CaptionProperty captionProperty = instance->GetCaptionProperty();
+            // Change the input info and then set the CaptionProperty
+            captionProperty.SetWindowColor(color);
+            returnVal = instance->SetCaptionPropertyTojson(captionProperty);
+        }
     } else {
         HILOG_INFO("argc size Error");
     }

interfaces/kits/napi/src/napi_accessibility_utils.cpp

@@ -1682,7 +1682,7 @@ uint32_t ConvertColorStringToNumer(std::string colorStr)
     HILOG_DEBUG("colorStr is %{public}s", colorStr.c_str());
     uint32_t color = COLOR_TRANSPARENT;
     if (colorStr.empty()) {
-      // empty string, return transparent
+        // Empty string, return transparent
         return color;
     }
     // Remove all " ".
@@ -1693,7 +1693,7 @@ uint32_t ConvertColorStringToNumer(std::string colorStr)
         colorStr.erase(0, 1);
         auto value = stoul(colorStr, nullptr, COLOR_STRING_BASE);
         if (colorStr.length() < COLOR_STRING_SIZE_STANDARD) {
-            // no alpha specified, set alpha to 0xff
+            // No alpha specified, set alpha to 0xff
             value |= COLOR_ALPHA_MASK;
         } else {
             auto alpha = value << ALPHA_MOVE;
@@ -1707,14 +1707,14 @@ uint32_t ConvertColorStringToNumer(std::string colorStr)
     if (std::regex_match(colorStr, COLOR_WITH_MAGIC_MINI)) {
         colorStr.erase(0, 1);
         std::string newColorStr;
-        // translate #rgb or #rgba to #rrggbb or #rrggbbaa
+        // Translate #rgb or #rgba to #rrggbb or #rrggbbaa
         for (auto& c : colorStr) {
             newColorStr += c;
             newColorStr += c;
         }
         auto valueMini = stoul(newColorStr, nullptr, COLOR_STRING_BASE);
         if (newColorStr.length() < COLOR_STRING_SIZE_STANDARD) {
-            // no alpha specified, set alpha to 0xff
+            // No alpha specified, set alpha to 0xff
             valueMini |= COLOR_ALPHA_MASK;
         } else {
             auto alphaMini = valueMini << ALPHA_MOVE;
@@ -1725,7 +1725,7 @@ uint32_t ConvertColorStringToNumer(std::string colorStr)
         return color;
     }
 
-    // match for special string
+    // Match for special string
     static const std::map<std::string, uint32_t> colorTable {
         std::make_pair("black", COLOR_BLACK),
         std::make_pair("blue", COLOR_BLUE),

interfaces/kits/napi/src/napi_accessibility_window_info.cpp

@@ -89,13 +89,13 @@ napi_value NAccessibilityWindowInfo::GetAnchorElementInfo(napi_env env, napi_cal
 
     napi_create_async_work(
         env, nullptr, resource,
-        // execute async to call c++ function
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilityWindowInfoData *callbackInfo = (NAccessibilityWindowInfoData*)data;
             AccessibilityWindowInfo windowInfo = callbackInfo->nativeWindowInfo_;
             callbackInfo->result_ = windowInfo.GetAnchor(callbackInfo->nodeInfo_);
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             HILOG_DEBUG("GetAnchorElementInfo execute back");
             NAccessibilityWindowInfoData* callbackInfo = (NAccessibilityWindowInfoData*)data;
@@ -170,13 +170,13 @@ napi_value NAccessibilityWindowInfo::GetRootElementInfo(napi_env env, napi_callb
 
     napi_create_async_work(
         env, nullptr, resource,
-        // execute async to call c++ function
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilityWindowInfoData *callbackInfo = (NAccessibilityWindowInfoData*)data;
             AccessibilityWindowInfo windowInfo = callbackInfo->nativeWindowInfo_;
             callbackInfo->result_ = windowInfo.GetRootAccessibilityInfo(callbackInfo->nodeInfo_);
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             HILOG_DEBUG("GetRootElementInfo execute back");
             NAccessibilityWindowInfoData* callbackInfo = (NAccessibilityWindowInfoData*)data;
@@ -251,13 +251,13 @@ napi_value NAccessibilityWindowInfo::GetParent(napi_env env, napi_callback_info
 
     napi_create_async_work(
         env, nullptr, resource,
-        // execute async to call c++ function
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilityWindowInfoData *callbackInfo = (NAccessibilityWindowInfoData*)data;
             AccessibilityWindowInfo windowInfo = callbackInfo->nativeWindowInfo_;
             callbackInfo->window_ = windowInfo.GetParent();
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             HILOG_DEBUG("GetParent execute back");
             NAccessibilityWindowInfoData* callbackInfo = (NAccessibilityWindowInfoData*)data;
@@ -332,13 +332,13 @@ napi_value NAccessibilityWindowInfo::GetChild(napi_env env, napi_callback_info i
 
     napi_create_async_work(
         env, nullptr, resource,
-        // execute async to call c++ function
+        // Execute async to call c++ function
         [](napi_env env, void* data) {
             NAccessibilityWindowInfoData *callbackInfo = (NAccessibilityWindowInfoData*)data;
             AccessibilityWindowInfo windowInfo = callbackInfo->nativeWindowInfo_;
             callbackInfo->window_ = windowInfo.GetChild(callbackInfo->childIndex_);
         },
-        // execute the complete function
+        // Execute the complete function
         [](napi_env env, napi_status status, void* data) {
             HILOG_DEBUG("GetChild execute back");
             NAccessibilityWindowInfoData* callbackInfo = (NAccessibilityWindowInfoData*)data;

services/aams/include/accessibility_account_data.h

@@ -137,7 +137,7 @@ public:
      */
     void AddConnectingA11yAbility(const AppExecFwk::ElementName& elementName);
 
-    void AddEnabledAbility(const AppExecFwk::ElementName& elementName);  // For UT
+    void AddEnabledAbility(const AppExecFwk::ElementName& elementName); // For UT
 
     /**
      * @brief Remove accessibility that have been opened.
@@ -146,7 +146,7 @@ public:
      */
     void RemoveEnabledAbility(const AppExecFwk::ElementName& elementName);
 
-    void AddInstalledAbility(AccessibilityAbilityInfo& abilityInfo);  // For UT
+    void AddInstalledAbility(AccessibilityAbilityInfo& abilityInfo); // For UT
 
     /**
      * @brief Empty installed accessibility list.
@@ -391,13 +391,13 @@ private:
     bool isGesturesSimulation_ = false;
     bool isCaptionState_ = false;
     CaptionProperty captionProperty_;
-    std::map<std::string, sptr<AccessibleAbilityConnection>> connectedA11yAbilities_;   // key: The URI of the
+    std::map<std::string, sptr<AccessibleAbilityConnection>> connectedA11yAbilities_; // key: The URI of ElementName.
     std::vector<sptr<IAccessibleAbilityManagerServiceState>> stateCallbacks_;
-    std::map<int, sptr<AccessibilityWindowConnection>> asacConnections_;    // key: windowId
+    std::map<int, sptr<AccessibilityWindowConnection>> asacConnections_; // key: windowId
     CaptionPropertyCallbacks captionPropertyCallbacks_;
     std::vector<AccessibilityAbilityInfo> installedAbilities_;
-    std::map<std::string, AppExecFwk::ElementName> enabledAbilities_;   // key: The URI of the ElementName.
-    std::map<std::string, AppExecFwk::ElementName> connectingA11yAbilities_;    // key: The URI of the ElementName.
+    std::map<std::string, AppExecFwk::ElementName> enabledAbilities_; // key: The URI of the ElementName.
+    std::map<std::string, AppExecFwk::ElementName> connectingA11yAbilities_; // key: The URI of the ElementName.
     std::shared_ptr<NativePreferences::Preferences> pref_ = nullptr;
 };
 } // namespace Accessibility

services/aams/include/accessibility_gesture_recognizer.h

@@ -31,12 +31,12 @@
 
 namespace OHOS {
 namespace Accessibility {
-const int64_t GESTURE_STARTED_TIME_THRESHOLD = 300;
-const int64_t GESTURE_NOT_STARTED_TIME_THRESHOLD = 150;
+const int64_t GESTURE_STARTED_TIME_THRESHOLD = 300000; // microsecond
+const int64_t GESTURE_NOT_STARTED_TIME_THRESHOLD = 150000; // microsecond
 const float DOUBLE_TAP_SLOP = 100.0f;
-const int64_t MIN_DOUBLE_TAP_TIME = 40;
-const int64_t DOUBLE_TAP_TIMEOUT = 300;
-const int64_t LONG_PRESS_TIMEOUT = 400;
+const int64_t MIN_DOUBLE_TAP_TIME = 40000; // microsecond
+const int64_t DOUBLE_TAP_TIMEOUT = 300000; // microsecond
+const int64_t LONG_PRESS_TIMEOUT = 400000; // microsecond
 const float DEGREES_THRESHOLD = 0.0f;
 const int32_t DIRECTION_NUM = 4;
 const int64_t US_TO_MS = 1000;
@@ -333,7 +333,7 @@ private:
     bool isDoubleTap_ = false;
     bool isRecognizingGesture_ = false;
     bool isGestureStarted_ = false;
-    int64_t startTime_ = 0;
+    int64_t startTime_ = 0; // microsecond
     float xMinPixels_ = 0;
     float yMinPixels_ = 0;
     float threshold_ = 0;

services/aams/include/accessibility_touchEvent_injector.h

@@ -29,7 +29,7 @@
 
 namespace OHOS {
 namespace Accessibility {
-const int64_t DOUBLE_TAP_MIN_TIME = 50;
+const int64_t DOUBLE_TAP_MIN_TIME = 50000; // microsecond
 
 struct SendEventArgs {
     std::shared_ptr<MMI::PointerEvent> event_;

services/aams/include/accessibility_touch_guider.h

@@ -27,7 +27,7 @@ namespace Accessibility {
 class TouchGuider;
 
 const int32_t MAX_POINTER_COUNT = 32;
-const int64_t EXIT_GESTURE_REC_TIMEOUT = 2000;
+const int64_t EXIT_GESTURE_REC_TIMEOUT = 2000; // millisecond
 const double MAX_DRAG_GESTURE_COSINE = 0.525321989;
 const int32_t MINI_POINTER_DISTANCE_DIP = 200;
 const int32_t INDEX_0 = 0;

services/aams/include/accessibility_window_manager.h

@@ -47,7 +47,7 @@ public:
     bool GetAccessibilityWindow(int windowId, AccessibilityWindowInfo &window);
     bool IsValidWindow(int windowId);
 
-    // test for ut to resize a window
+    // Test for ut to resize a window
     void SetWindowSize(int windowId, Rect rect);
     void UpdateWindowLayer(const sptr<Rosen::AccessibilityWindowInfo>& windowInfo);
 

services/aams/src/accessibility_account_data.cpp

@@ -38,7 +38,6 @@ int AccessibilityAccountData::GetAccountId()
     return id_;
 }
 
-// get client state.
 uint32_t AccessibilityAccountData::GetAccessibilityState()
 {
     HILOG_DEBUG("start.");
@@ -73,11 +72,10 @@ uint32_t AccessibilityAccountData::GetAccessibilityState()
     return state;
 }
 
-// switch the user causes state changed.
 void AccessibilityAccountData::OnAccountSwitched()
 {
     HILOG_DEBUG("start.");
-    // reset AccessibleAbilityConnection
+    // Reset AccessibleAbilityConnection
     for (auto itr = connectedA11yAbilities_.begin(); itr != connectedA11yAbilities_.end(); itr++) {
         itr->second->Disconnect();
     }
@@ -95,7 +93,6 @@ void AccessibilityAccountData::OnAccountSwitched()
     isGesturesSimulation_ = false;
 }
 
-// add connect ability.
 void AccessibilityAccountData::AddConnectedAbility(sptr<AccessibleAbilityConnection>& connection)
 {
     HILOG_DEBUG("URI is %{public}s", connection->GetElementName().GetURI().c_str());
@@ -106,7 +103,6 @@ void AccessibilityAccountData::AddConnectedAbility(sptr<AccessibleAbilityConnect
     HILOG_DEBUG("Add ConnectedAbility: %{public}d", connectedA11yAbilities_.size());
 }
 
-// remove connect ability.
 void AccessibilityAccountData::RemoveConnectedAbility(sptr<AccessibleAbilityConnection>& connection)
 {
     HILOG_DEBUG("URI is %{public}s", connection->GetElementName().GetURI().c_str());
@@ -125,7 +121,6 @@ void AccessibilityAccountData::AddStateCallback(const sptr<IAccessibleAbilityMan
     stateCallbacks_.push_back(callback);
 }
 
-// remove IAccessibleAbilityManagerServiceState
 void AccessibilityAccountData::RemoveStateCallback(const wptr<IRemoteObject>& callback)
 {
     HILOG_DEBUG("start.");
@@ -154,7 +149,7 @@ void AccessibilityAccountData::RemoveCaptionPropertyCallback(const wptr<IRemoteO
         }
     }
 }
-// add AccessibilityInteractionConnection
+
 void AccessibilityAccountData::AddAccessibilityWindowConnection(
     const int windowId, const sptr<AccessibilityWindowConnection>& interactionConnection)
 {
@@ -164,7 +159,6 @@ void AccessibilityAccountData::AddAccessibilityWindowConnection(
     }
 }
 
-// remove AccessibilityWindowConnection
 void AccessibilityAccountData::RemoveAccessibilityWindowConnection(const int windowId)
 {
     HILOG_DEBUG("windowId(%{public}d)", windowId);
@@ -195,7 +189,6 @@ void AccessibilityAccountData::RemoveConnectingA11yAbility(const AppExecFwk::Ele
     HILOG_DEBUG("Remove ConnectingA11yAbility: %{public}d", connectingA11yAbilities_.size());
 }
 
-// For UT
 void AccessibilityAccountData::AddEnabledAbility(const AppExecFwk::ElementName& elementName)
 {
     HILOG_DEBUG("start.");
@@ -249,7 +242,6 @@ void AccessibilityAccountData::RemoveEnabledAbility(const AppExecFwk::ElementNam
     RemoveEnabledFromPref(elementName.GetBundleName());
 }
 
-// For UT
 void AccessibilityAccountData::AddInstalledAbility(AccessibilityAbilityInfo& abilityInfo)
 {
     HILOG_DEBUG("abilityInfo's bundle name is %{public}s", abilityInfo.GetPackageName().c_str());
@@ -283,7 +275,6 @@ void AccessibilityAccountData::ClearInstalledAbility()
     installedAbilities_.clear();
 }
 
-// get AccessibleAbilityConnection
 const sptr<AccessibleAbilityConnection> AccessibilityAccountData::GetAccessibleAbilityConnection(
     const std::string elementName)
 {
@@ -301,7 +292,6 @@ const sptr<AccessibleAbilityConnection> AccessibilityAccountData::GetAccessibleA
     return nullptr;
 }
 
-// get AccessibilityWindowConnection.
 const sptr<AccessibilityWindowConnection> AccessibilityAccountData::GetAccessibilityWindowConnection(
     const int windowId)
 {
@@ -313,7 +303,6 @@ const sptr<AccessibilityWindowConnection> AccessibilityAccountData::GetAccessibi
     return nullptr;
 }
 
-// get map<std::string, sptr<AccessibleAbilityConnection>> connectedA11yAbilities_
 const std::map<std::string, sptr<AccessibleAbilityConnection>> AccessibilityAccountData::GetConnectedA11yAbilities()
 {
     HILOG_DEBUG("start.");
@@ -326,7 +315,6 @@ const std::vector<sptr<IAccessibleAbilityManagerServiceState>> AccessibilityAcco
     return stateCallbacks_;
 }
 
-// get map<int, sptr<AccessibilityWindowConnection>> asacConnections_
 const std::map<int, sptr<AccessibilityWindowConnection>> AccessibilityAccountData::GetAsacConnections()
 {
     HILOG_DEBUG("start.");
@@ -339,14 +327,12 @@ const CaptionPropertyCallbacks AccessibilityAccountData::GetCaptionPropertyCallb
     return captionPropertyCallbacks_;
 }
 
-// get connectingA11yAbilities_.
 const std::map<std::string, AppExecFwk::ElementName> AccessibilityAccountData::GetConnectingA11yAbilities()
 {
     HILOG_DEBUG("start.");
     return connectingA11yAbilities_;
 }
 
-// get enabledAbilities_.
 const std::map<std::string, AppExecFwk::ElementName> AccessibilityAccountData::GetEnabledAbilities()
 {
     HILOG_DEBUG("enabledAbilities_ size is (%{public}d).", enabledAbilities_.size());
@@ -357,7 +343,6 @@ const std::map<std::string, AppExecFwk::ElementName> AccessibilityAccountData::G
     return enabledAbilities_;
 }
 
-// get installedAbilities_.
 const std::vector<AccessibilityAbilityInfo> AccessibilityAccountData::GetInstalledAbilities()
 {
     HILOG_DEBUG("start.");
@@ -422,7 +407,7 @@ void AccessibilityAccountData::UpdateEventTouchGuideCapability()
             return;
         }
     }
-    isEventTouchGuideState_ = false; // temp deal
+    isEventTouchGuideState_ = false;
 }
 
 void AccessibilityAccountData::UpdateGesturesSimulationCapability()
@@ -629,8 +614,6 @@ void AccessibilityAccountData::UpdateEnabledFromPref()
 bool AccessibilityAccountData::SetEnabledObj(std::map<std::string, AppExecFwk::ElementName> it)
 {
     HILOG_DEBUG("start.");
-
-    // add ability to the last of enabledAbilities_
     for (auto& ability : it) {
         enabledAbilities_.insert(std::pair<std::string, AppExecFwk::ElementName>(ability.first, ability.second));
     }
@@ -645,13 +628,16 @@ bool AccessibilityAccountData::ReadConfigurationForAccountData()
     return true;
 }
 
-// get installedAbilities_.
 bool AccessibilityAccountData::GetInstalledAbilitiesFromBMS()
 {
     HILOG_DEBUG("start.");
 
     std::vector<AppExecFwk::ExtensionAbilityInfo> extensionInfos;
     auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr.");
+        return false;
+    }
     sptr<AppExecFwk::IBundleMgr> bms = nullptr;
     bms = aams->GetBundleMgrProxy();
     if (!bms) {
@@ -802,15 +788,15 @@ void AccessibilityAccountData::StringToVector(std::string &stringIn, std::vector
         for (int i = 0; i <= wrodCount; i++) {
             if (i == 0) {
                 length = position[i];
-                vectorResult.push_back(stringIn.substr(startWrod, length)); // first string
+                vectorResult.push_back(stringIn.substr(startWrod, length)); // First string
             } else if (i < wrodCount) {
                 startWrod = position[i - 1] + 1;
                 length = position[i] - position[i - 1] - 1;
-                vectorResult.push_back(stringIn.substr(startWrod, length)); // second string to last-1 string
+                vectorResult.push_back(stringIn.substr(startWrod, length)); // Second string to last-1 string
             } else {
                 startWrod = position[i - 1] + 1;
                 length = strLength - position[i - 1] - 1;
-                vectorResult.push_back(stringIn.substr(startWrod, length)); // last string
+                vectorResult.push_back(stringIn.substr(startWrod, length)); // Last string
             }
         }
     }

services/aams/src/accessibility_common_event_registry.cpp

@@ -63,7 +63,6 @@ bool AccessibilityCommonEventRegistry::RegisterSubscriber()
 {
     HILOG_DEBUG("start.");
 
-    bool subscribeResult = false;
     MatchingSkills matchingSkills;
     for (auto &event : handleEventFunc_) {
         HILOG_DEBUG("Add event: %{public}s", event.first.c_str());
@@ -76,9 +75,9 @@ bool AccessibilityCommonEventRegistry::RegisterSubscriber()
 
     int retry = RETRY_SUBSCRIBER;
     do {
-        subscribeResult = CommonEventManager::SubscribeCommonEvent(accessibilityCommonEventSubscriber_);
+        bool subscribeResult = CommonEventManager::SubscribeCommonEvent(accessibilityCommonEventSubscriber_);
         if (subscribeResult) {
-            break;
+            return true;
         } else {
             HILOG_DEBUG("SubscribeCommonEvent failed, retry %{public}d", retry);
             retry--;
@@ -86,7 +85,7 @@ bool AccessibilityCommonEventRegistry::RegisterSubscriber()
         }
     } while (retry);
 
-    return subscribeResult;
+    return false;
 }
 
 void AccessibilityCommonEventRegistry::UnRegister()
@@ -123,43 +122,72 @@ void AccessibilityCommonEventSubscriber::HandleEvent(const Want &want)
 void AccessibilityCommonEventRegistry::HandleRemovedUser(const Want &want) const
 {
     HILOG_DEBUG("start.");
-
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
     int32_t accountId = want.GetIntParam(CommonEventSupport::COMMON_EVENT_USER_REMOVED, -1);
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->RemovedUser(accountId);
+    aams->RemovedUser(accountId);
 }
 
 void AccessibilityCommonEventRegistry::HandlePresentUser(const Want &want) const
 {
     HILOG_DEBUG("start.");
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->PresentUser();
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
+    aams->PresentUser();
 }
 
 void AccessibilityCommonEventRegistry::HandlePackageRemoved(const Want &want) const
 {
     HILOG_DEBUG("start.");
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
     string bundleName = want.GetBundle();
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->PackageRemoved(bundleName);
+    aams->PackageRemoved(bundleName);
 }
 
 void AccessibilityCommonEventRegistry::HandlePackageAdd(const Want &want) const
 {
     HILOG_DEBUG("start.");
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
     string bundleName = want.GetBundle();
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->PackageAdd(bundleName);
+    aams->PackageAdd(bundleName);
 }
 
 void AccessibilityCommonEventRegistry::HandlePackageUpdateFinished(const Want &want) const
 {
     HILOG_DEBUG("start.");
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
     string bundleName = want.GetBundle();
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->PackageUpdateFinished(bundleName);
+    aams->PackageUpdateFinished(bundleName);
 }
 
 void AccessibilityCommonEventRegistry::HandlePackageChanged(const Want &want) const
 {
     HILOG_DEBUG("start.");
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
     string bundleName = want.GetBundle();
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->PackageChanged(bundleName);
+    aams->PackageChanged(bundleName);
 }
 } // namespace Accessibility
 } // namespace OHOS

services/aams/src/accessibility_gesture_recognizer.cpp

@@ -69,7 +69,12 @@ AccessibilityGestureRecognizer::AccessibilityGestureRecognizer()
     int slop = (int) (densityPixels * DOUBLE_TAP_SLOP + 0.5f);
     doubleTapScaledSlop_ = slop * slop;
 
-    runner_ = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->GetMainRunner();
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
+    runner_ = aams->GetMainRunner();
     if (!runner_) {
         HILOG_ERROR("get runner failed");
         return;
@@ -159,7 +164,7 @@ void AccessibilityGestureRecognizer::HandleTouchDownEvent(MMI::PointerEvent &eve
     pointerRoute_.push_back(mp);
     prePointer_ = pointerIterm;
     startPointer_ = pointerIterm;
-    startTime_ = event.GetActionTime() / US_TO_MS;
+    startTime_ = event.GetActionTime();
 }
 
 bool AccessibilityGestureRecognizer::HandleTouchMoveEvent(MMI::PointerEvent &event)
@@ -171,7 +176,7 @@ bool AccessibilityGestureRecognizer::HandleTouchMoveEvent(MMI::PointerEvent &eve
     if (!event.GetPointerItem(event.GetPointerId(), pointerIterm)) {
         HILOG_ERROR("get GetPointerItem(%d) failed", event.GetPointerId());
     }
-    int64_t eventTime = event.GetActionTime() / US_TO_MS;
+    int64_t eventTime = event.GetActionTime();
     float offsetX = startPointer_.GetGlobalX() - pointerIterm.GetGlobalX();
     float offsetY = startPointer_.GetGlobalY() - pointerIterm.GetGlobalY();
     double duration = hypot(offsetX, offsetY);
@@ -250,14 +255,14 @@ bool AccessibilityGestureRecognizer::StandardGestureRecognizer(MMI::PointerEvent
                     isDoubleTapdetecting_ = true;
                     isDoubleTap_ = true;
                 } else {
-                    handler_->SendEvent(SINGLE_TAP_MSG, 0, DOUBLE_TAP_TIMEOUT);
+                    handler_->SendEvent(SINGLE_TAP_MSG, 0, DOUBLE_TAP_TIMEOUT / US_TO_MS);
                 }
                 pCurDown_ = std::make_shared<MMI::PointerEvent>(event);
                 isTapDown_ = true;
                 continueDown_ = true;
                 isLongpress_ = false;
                 handler_->RemoveEvent(LONG_PRESS_MSG);
-                handler_->SendEvent(LONG_PRESS_MSG, 0, LONG_PRESS_TIMEOUT);
+                handler_->SendEvent(LONG_PRESS_MSG, 0, LONG_PRESS_TIMEOUT / US_TO_MS);
             } else {
                 StandardGestureCancled();
             }
@@ -322,14 +327,17 @@ bool AccessibilityGestureRecognizer::DoubleTapRecognized(MMI::PointerEvent &even
 bool AccessibilityGestureRecognizer::recognizeDirectionGesture(MMI::PointerEvent &event)
 {
     HILOG_DEBUG();
+    if (!listener_) {
+        HILOG_ERROR("listener_ is nullptr.");
+        return false;
+    }
 
     if (pointerRoute_.size() < LIMIT_SIZE_TWO) {
         return listener_->OnCancelled(event);
     }
 
-    /* Check the angle of the most recent motion vector versus the preceding motion vector,
-     * segment the line if the angle is about 90 degrees.
-     */
+    // Check the angle of the most recent motion vector versus the preceding motion vector, 
+    // segment the line if the angle is about 90 degrees.
     std::vector<Pointer> pointerPath = GetPointerPath(pointerRoute_);
 
     if (pointerPath.size() == LIMIT_SIZE_TWO) {
@@ -410,7 +418,7 @@ std::vector<Pointer> AccessibilityGestureRecognizer::GetPointerPath(std::vector<
 bool AccessibilityGestureRecognizer::isDoubleTap(MMI::PointerEvent &event)
 {
     HILOG_DEBUG();
-    int64_t durationTime = (event.GetActionTime() - pPreUp_->GetActionTime()) / US_TO_MS;
+    int64_t durationTime = event.GetActionTime() - pPreUp_->GetActionTime();
     if (!(durationTime <= DOUBLE_TAP_TIMEOUT && durationTime >= MIN_DOUBLE_TAP_TIME)) {
         return false;
     }

services/aams/src/accessibility_interaction_bridge.cpp

@@ -32,7 +32,6 @@ AccessibilityInteractionBridge& AccessibilityInteractionBridge::GetInstance()
 {
     HILOG_DEBUG("start");
     static AccessibilityInteractionBridge instance_;
-
     return instance_;
 }
 
@@ -46,7 +45,12 @@ AccessibilityInteractionBridge::AccessibilityInteractionBridge()
         return;
     }
     abilityInfo->SetCapabilityValues(Capability::CAPABILITY_RETRIEVE);
-    accountData_ = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->GetCurrentAccountData();
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
+    accountData_ = aams->GetCurrentAccountData();
     connection_ = new(std::nothrow) AccessibleAbilityConnection(accountData_,
         INTERACTION_BRIDGE_CHANNEL_ID, *abilityInfo);
     if (!connection_) {

services/aams/src/accessibility_touchEvent_injector.cpp

@@ -18,9 +18,9 @@
 
 namespace OHOS {
 namespace Accessibility {
-const int g_value_1000 = 1000;
-const int g_value_1000000 = 1000000;
-const int g_msToUs = 1000;
+#define NS_TO_US 1000
+#define S_TO_US 1000000
+#define MS_TO_US 1000
 TouchInjectHandler::TouchInjectHandler(const std::shared_ptr<AppExecFwk::EventRunner> &runner,
     TouchEventInjector &server) : AppExecFwk::EventHandler(runner), server_(server)
 {
@@ -29,12 +29,18 @@ TouchInjectHandler::TouchInjectHandler(const std::shared_ptr<AppExecFwk::EventRu
 void TouchInjectHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointer &event)
 {
     std::shared_ptr<SendEventArgs> parameters = nullptr;
+    if (!event) {
+        HILOG_ERROR("event is nullptr");
+        return;
+    }
     switch (event->GetInnerEventId()) {
         case TouchEventInjector::SEND_TOUCH_EVENT_MSG:
             parameters = event->GetSharedObject<SendEventArgs>();
             server_.SendPointerEvent(*parameters->event_);
             if (parameters->isLastEvent_) {
-                server_.GetCurrentGestureService()->OnGestureSimulateResult(server_.GetSequence(), true);
+                if (server_.GetCurrentGestureService()){
+                    server_.GetCurrentGestureService()->OnGestureSimulateResult(server_.GetSequence(), true);
+                }
             }
             break;
         case TouchEventInjector::INJECT_EVENT_MSG:
@@ -47,7 +53,12 @@ void TouchInjectHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointer &eve
 
 TouchEventInjector::TouchEventInjector()
 {
-    runner_ = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->GetMainRunner();
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
+    runner_ = aams->GetMainRunner();
     if (!runner_) {
         HILOG_ERROR("get runner failed");
         return;
@@ -91,23 +102,23 @@ void TouchEventInjector::GetTapsEvents(int64_t startTime)
     int64_t nowTime = startTime;
     pointer.SetPointerId(1);
     for (unsigned int i = 0; i < gesturePath_.size(); i++) {
-        /* append down event */
+        // Append down event
         float px = gesturePath_[i].GetStartPosition().GetPositionX();
         float py = gesturePath_[i].GetStartPosition().GetPositionY();
         pointer.SetGlobalX(px);
         pointer.SetGlobalY(py);
-        pointer.SetDownTime(downTime * g_msToUs);
+        pointer.SetDownTime(downTime);
         event = obtainTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, pointer, downTime);
         HILOG_INFO("append down event");
         injectedEvents_.push_back(event);
 
-        nowTime += gesturePath_[i].GetDurationTime();
-        /* append up event */
+        nowTime += gesturePath_[i].GetDurationTime() * MS_TO_US;
+        // Append up event
         px = gesturePath_[i].GetEndPosition().GetPositionX();
         py = gesturePath_[i].GetEndPosition().GetPositionY();
         pointer.SetGlobalX(px);
         pointer.SetGlobalY(py);
-        pointer.SetDownTime(downTime * g_msToUs);
+        pointer.SetDownTime(downTime);
         event = obtainTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, pointer, nowTime);
         HILOG_INFO("append up event");
         injectedEvents_.push_back(event);
@@ -123,13 +134,13 @@ void TouchEventInjector::GetMovesEvents(int64_t startTime)
     MMI::PointerEvent::PointerItem pointer = {};
     int64_t downTime = startTime;
     int64_t nowTime = startTime;
-    /* append down event */
+    // Append down event
     float px = gesturePath_[0].GetStartPosition().GetPositionX();
     float py = gesturePath_[0].GetStartPosition().GetPositionY();
     pointer.SetPointerId(1);
     pointer.SetGlobalX(px);
     pointer.SetGlobalY(py);
-    pointer.SetDownTime(downTime * g_msToUs);
+    pointer.SetDownTime(downTime);
     event = obtainTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, pointer, downTime);
     HILOG_INFO("append down event");
     injectedEvents_.push_back(event);
@@ -138,18 +149,18 @@ void TouchEventInjector::GetMovesEvents(int64_t startTime)
         py = gesturePath_[i].GetEndPosition().GetPositionY();
         pointer.SetGlobalX(px);
         pointer.SetGlobalY(py);
-        pointer.SetDownTime(downTime * g_msToUs);
+        pointer.SetDownTime(downTime);
         HILOG_INFO("append move event");
-        nowTime += gesturePath_[i].GetDurationTime();
+        nowTime += gesturePath_[i].GetDurationTime() * MS_TO_US;
         event = obtainTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, pointer, nowTime);
         injectedEvents_.push_back(event);
     }
-    /* append up event */
+    // Append up event
     px = gesturePath_[gesturePath_.size() - 1].GetEndPosition().GetPositionX();
     py = gesturePath_[gesturePath_.size() - 1].GetEndPosition().GetPositionY();
     pointer.SetGlobalX(px);
     pointer.SetGlobalY(py);
-    pointer.SetDownTime(downTime * g_msToUs);
+    pointer.SetDownTime(downTime);
     event = obtainTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, pointer, nowTime);
     HILOG_INFO("append up event");
     injectedEvents_.push_back(event);
@@ -186,8 +197,10 @@ void TouchEventInjector::InjectEventsInner()
         std::shared_ptr<SendEventArgs> parameters = std::make_shared<SendEventArgs>();
         parameters->isLastEvent_ = (i == injectedEvents_.size() - 1) ? true : false;
         parameters->event_ = injectedEvents_[i];
-        if (g_msToUs - curTime != 0) {
-            int64_t timeout = injectedEvents_[i]->GetActionTime() / g_msToUs - curTime;
+        int64_t timeout = (injectedEvents_[i]->GetActionTime() - curTime) / MS_TO_US;
+        if (timeout < 0) {
+            HILOG_INFO("timeout is error.%{public}lld", timeout);
+        } else {
             handler_->SendEvent(SEND_TOUCH_EVENT_MSG, parameters, timeout);
         }
     }
@@ -215,7 +228,7 @@ void TouchEventInjector::CancelGesture()
     MMI::PointerEvent::PointerItem pointer = {};
     pointer.SetPointerId(1);
     int64_t time = getSystemTime();
-    pointer.SetDownTime(time * g_msToUs);
+    pointer.SetDownTime(time);
     pointer.SetPointerId(1);
     if (GetNext() != nullptr && isGestureUnderway_) {
         event = obtainTouchEvent(MMI::PointerEvent::POINTER_ACTION_CANCEL, pointer, time);
@@ -252,7 +265,7 @@ std::shared_ptr<MMI::PointerEvent> TouchEventInjector::obtainTouchEvent(int acti
     std::shared_ptr<MMI::PointerEvent> pointerEvent = MMI::PointerEvent::Create();
     pointerEvent->SetPointerId(point.GetPointerId());
     pointerEvent->SetPointerAction(action);
-    pointerEvent->SetActionTime(actionTime * g_msToUs);
+    pointerEvent->SetActionTime(actionTime);
     pointerEvent->SetActionStartTime(point.GetDownTime());
     pointerEvent->AddPointerItem(point);
     pointerEvent->SetSourceType(MMI::PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
@@ -264,9 +277,9 @@ int64_t TouchEventInjector::getSystemTime()
     HILOG_INFO("TouchEventInjector::getSystemTime: start");
     struct timespec times = {0, 0};
     clock_gettime(CLOCK_MONOTONIC, &times);
-    int64_t millisecond = (int64_t)(times.tv_sec * g_value_1000 + times.tv_nsec / g_value_1000000);
+    int64_t microsecond = (int64_t)(times.tv_sec * S_TO_US + times.tv_nsec / NS_TO_US);
 
-    return millisecond;
+    return microsecond;
 }
 } // namespace Accessibility
 } // namespace OHOS

services/aams/src/accessibility_touch_guider.cpp

@@ -41,6 +41,10 @@ void TouchGuider::StartUp()
     HILOG_DEBUG();
     touchGuideListener_ = std::make_unique<TouchGuideListener>(*this);
     gestureRecognizer_.RegisterListener(*touchGuideListener_.get());
+    if (!pAams_) {
+        HILOG_ERROR("pAams_ is nullptr");
+        return;
+    }
     runner_ = pAams_->GetMainRunner();
     if (!runner_) {
         HILOG_ERROR("get runner failed");
@@ -293,7 +297,7 @@ bool TouchGuider::TouchGuideListener::OnCompleted(GestureType gestureId)
     server_.CancelPostEvent(EXIT_GESTURE_REC_MSG);
     server_.currentState_ = static_cast<int>(TouchGuideState::TOUCH_GUIDING);
 
-    // send customize gesture type to aa
+    // Send customize gesture type to aa
     AccessibilityEventInfo eventInfo {};
     eventInfo.SetEventType(EventType::TYPE_GESTURE_EVENT);
     eventInfo.SetGestureType(gestureId);
@@ -590,7 +594,7 @@ void TouchGuider::HandleDraggingStateInnerMove(MMI::PointerEvent &event)
     if (pointCount == POINTER_COUNT_1) {
         HILOG_INFO("Only two pointers can be received in the dragging state");
     } else if (pointCount == POINTER_COUNT_2 && IsDragGestureAccept(event)) {
-        // get densityPixels from WMS
+        // Get densityPixels from WMS
         AccessibilityDisplayManager &displayMgr = AccessibilityDisplayManager::GetInstance();
         auto display = displayMgr.GetDefaultDisplay();
         float densityPixels = display->GetVirtualPixelRatio();
@@ -787,7 +791,7 @@ void TouchGuider::PostHoverEnterAndMove(MMI::PointerEvent &event)
 
     CancelPostEventIfNeed(SEND_HOVER_ENTER_MOVE_MSG);
     pointerEvents_.push_back(event);
-    handler_->SendEvent(SEND_HOVER_ENTER_MOVE_MSG, 0, DOUBLE_TAP_TIMEOUT);
+    handler_->SendEvent(SEND_HOVER_ENTER_MOVE_MSG, 0, DOUBLE_TAP_TIMEOUT / US_TO_MS);
 }
 
 void TouchGuider::PostHoverExit()
@@ -795,7 +799,7 @@ void TouchGuider::PostHoverExit()
     HILOG_DEBUG();
 
     CancelPostEventIfNeed(SEND_HOVER_EXIT_MSG);
-    handler_->SendEvent(SEND_HOVER_EXIT_MSG, 0, DOUBLE_TAP_TIMEOUT);
+    handler_->SendEvent(SEND_HOVER_EXIT_MSG, 0, DOUBLE_TAP_TIMEOUT / US_TO_MS);
 }
 
 void TouchGuider::PostAccessibilityEvent(uint32_t innerEventID)

services/aams/src/accessibility_window_manager.cpp

@@ -23,6 +23,10 @@ void AccessibilityWindowListener::OnWindowUpdate(const sptr<Rosen::Accessibility
 {
     HILOG_DEBUG("windowId[%{public}d] type[%{public}d]", windowInfo->currentWindowInfo_->wid_, type);
     auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
     auto accountData = aams->GetCurrentAccountData();
 
     auto& winMgr = AccessibilityWindowInfoManager::GetInstance();
@@ -190,8 +194,10 @@ void AccessibilityWindowInfoManager::SetActiveWindow(int windowId)
         activeWindowId_ = windowId;
         a11yWindows_[activeWindowId_].SetActive(true);
         auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
-        AccessibilityEventInfo evtInf(activeWindowId_, WINDOW_UPDATE_ACTIVE);
-        aams->SendEvent(evtInf, aams->GetCurrentAccountId());
+        if (aams) {
+            AccessibilityEventInfo evtInf(activeWindowId_, WINDOW_UPDATE_ACTIVE);
+            aams->SendEvent(evtInf, aams->GetCurrentAccountId());
+        }
     }
     HILOG_DEBUG("activeWindowId is %{public}d", activeWindowId_);
 }

services/aams/src/accessibility_zoom_gesture.cpp

@@ -18,7 +18,7 @@
 
 namespace OHOS {
 namespace Accessibility {
-/**
+/*
  * Triple: DOWN UP DOWN UP DOWN
  */
 const int DOWN_COUNT = 3;

services/aams/src/accessible_ability_connection.cpp

@@ -45,6 +45,10 @@ bool AccessibleAbilityChannelStubImpl::SearchElementInfoByAccessibilityId(const
     const int mode)
 {
     wptr<AccessibilityAccountData> accountData = connection_.GetAccountData();
+    if (!accountData.GetRefPtr()) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     int realWindowId = AccessibilityWindowInfoManager::GetInstance().ConvertToRealWindowId(accessibilityWindowId,
                                                                                            FOCUS_TYPE_INVALID);
     sptr<AccessibilityWindowConnection> connection =
@@ -71,6 +75,10 @@ bool AccessibleAbilityChannelStubImpl::SearchElementInfosByText(const int access
     const sptr<IAccessibilityElementOperatorCallback> &callback)
 {
     wptr<AccessibilityAccountData> accountData = connection_.GetAccountData();
+    if (!accountData.GetRefPtr()) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     int realWindowId = AccessibilityWindowInfoManager::GetInstance().ConvertToRealWindowId(accessibilityWindowId,
                                                                                            FOCUS_TYPE_INVALID);
 
@@ -97,6 +105,10 @@ bool AccessibleAbilityChannelStubImpl::FindFocusedElementInfo(const int accessib
     const sptr<IAccessibilityElementOperatorCallback> &callback)
 {
     wptr<AccessibilityAccountData> accountData = connection_.GetAccountData();
+    if (!accountData.GetRefPtr()) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     int realWindowId = AccessibilityWindowInfoManager::GetInstance().ConvertToRealWindowId(accessibilityWindowId,
                                                                                            focusType);
 
@@ -122,6 +134,10 @@ bool AccessibleAbilityChannelStubImpl::FocusMoveSearch(const int accessibilityWi
     const int direction, const int requestId, const sptr<IAccessibilityElementOperatorCallback> &callback)
 {
     wptr<AccessibilityAccountData> accountData = connection_.GetAccountData();
+    if (!accountData.GetRefPtr()) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     int realWindowId = AccessibilityWindowInfoManager::GetInstance().ConvertToRealWindowId(accessibilityWindowId,
                                                                                            FOCUS_TYPE_INVALID);
 
@@ -135,6 +151,10 @@ bool AccessibleAbilityChannelStubImpl::FocusMoveSearch(const int accessibilityWi
         HILOG_ERROR("AccessibleAbilityChannelStubImpl::FocusMoveSearch failed: no capability");
         return false;
     }
+    if (!connection->GetProxy()) {
+        HILOG_ERROR("get proxy failed");
+        return false;
+    }
     connection->GetProxy()->FocusMoveSearch(elementId, direction, requestId, callback);
     return true;
 }
@@ -145,6 +165,10 @@ bool AccessibleAbilityChannelStubImpl::ExecuteAction(const int accessibilityWind
 {
     HILOG_DEBUG("ExecuteAction accessibilityWindowId = %{public}d", accessibilityWindowId);
     wptr<AccessibilityAccountData> accountData = connection_.GetAccountData();
+    if (!accountData.GetRefPtr()) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     int realWindowId = AccessibilityWindowInfoManager::GetInstance().ConvertToRealWindowId(accessibilityWindowId,
                                                                                            FOCUS_TYPE_INVALID);
 
@@ -158,6 +182,10 @@ bool AccessibleAbilityChannelStubImpl::ExecuteAction(const int accessibilityWind
         HILOG_ERROR("AccessibleAbilityChannelStubImpl::ExecuteAction failed: no capability");
         return false;
     }
+    if (!connection->GetProxy()) {
+        HILOG_ERROR("get proxy failed");
+        return false;
+    }
     connection->GetProxy()->ExecuteAction(elementId, action, actionArguments, requestId, callback);
     return true;
 }
@@ -221,8 +249,12 @@ bool AccessibleAbilityChannelStubImpl::ExecuteCommonAction(int action)
 
 void AccessibleAbilityChannelStubImpl::SetOnKeyPressEventResult(const bool handled, const int sequence)
 {
-    sptr<KeyEventFilter> keyEventFilter =
-        DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->GetKeyEventFilter();
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
+    sptr<KeyEventFilter> keyEventFilter = aams->GetKeyEventFilter();
     if (!keyEventFilter) {
         return;
     }
@@ -280,8 +312,12 @@ void AccessibleAbilityChannelStubImpl::SendSimulateGesture(const int requestId,
         proxy->OnGestureSimulateResult(requestId, false);
         return;
     }
-    sptr<TouchEventInjector> touchEventInjector =
-        DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->GetTouchEventInjector();
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
+    sptr<TouchEventInjector> touchEventInjector = aams->GetTouchEventInjector();
     if (!touchEventInjector) {
         proxy->OnGestureSimulateResult(requestId, false);
         return;
@@ -308,13 +344,22 @@ void AccessibleAbilityConnection::OnAbilityConnectDone(const AppExecFwk::Element
     const sptr<IRemoteObject> &remoteObject, int resultCode)
 {
     HILOG_DEBUG("start.");
+    if (!accountData_) {
+        HILOG_ERROR("accountData_ is nullptr.");
+        return;
+    }
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr.");
+        return;
+    }
     elementName_ = element;
 
     if (resultCode != NO_ERROR) {
         HILOG_ERROR("Connect failed!");
         accountData_->RemoveEnabledAbility(elementName_);
         accountData_->RemoveConnectingA11yAbility(elementName_);
-        DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->UpdateAbilities();
+        aams->UpdateAbilities();
         // temp deal: Notify setting
         return;
     }
@@ -346,14 +391,14 @@ void AccessibleAbilityConnection::OnAbilityConnectDone(const AppExecFwk::Element
         }
     }
 
-    if (!proxy_->AsObject()->AddDeathRecipient(deathRecipient_)) {
+    if (!proxy_->AsObject() || !proxy_->AsObject()->AddDeathRecipient(deathRecipient_)) {
         HILOG_ERROR("Failed to add death recipient");
     }
 
     sptr<AccessibleAbilityConnection> pointer = this;
     accountData_->AddConnectedAbility(pointer);
     accountData_->RemoveConnectingA11yAbility(elementName_);
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->UpdateAccessibilityManagerService();
+    aams->UpdateAccessibilityManagerService();
 
     stub_ = new(std::nothrow) AccessibleAbilityChannelStubImpl(*pointer);
     if (!stub_) {
@@ -377,14 +422,25 @@ void AccessibleAbilityConnection::OnAbilityDisconnectDone(const AppExecFwk::Elem
         return;
     }
 
+    if (!accountData_) {
+        HILOG_ERROR("accountData_ is nullptr.");
+        return;
+    }
     sptr<AccessibleAbilityConnection> pointer = this;
     accountData_->RemoveConnectedAbility(pointer);
     accountData_->RemoveEnabledAbility(element);
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->UpdateAbilities();
 
-    int32_t currentAccountId = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->GetCurrentAccountId();
+
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
+    aams->UpdateAbilities();
+
+    int32_t currentAccountId = aams->GetCurrentAccountId();
     if (accountData_->GetAccountId() == currentAccountId) {
-        DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->UpdateAccessibilityManagerService();
+        aams->UpdateAccessibilityManagerService();
     }
 }
 
@@ -460,6 +516,10 @@ bool AccessibleAbilityConnection::OnKeyPressEvent(const MMI::KeyEvent &keyEvent,
     }
 
     auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return false;
+    }
     if (aams->IsWantedKeyEvent(const_cast<MMI::KeyEvent&>(keyEvent))) {
         proxy_->OnKeyPressEvent(keyEvent, sequence);
         return true;
@@ -507,7 +567,12 @@ AAFwk::Want CreateWant(AppExecFwk::ElementName& element)
 void AccessibleAbilityConnection::Disconnect()
 {
     HILOG_DEBUG("start");
-    if (AAFwk::AbilityManagerClient::GetInstance()->DisconnectAbility(this) != ERR_OK) {
+    auto abilityManagerClient = AAFwk::AbilityManagerClient::GetInstance();
+    if (!abilityManagerClient) {
+        HILOG_ERROR("abilityManagerClient is nullptr");
+        return;
+    }
+    if (abilityManagerClient->DisconnectAbility(this) != ERR_OK) {
         HILOG_ERROR("Disconnect failed!");
         return;
     }
@@ -516,17 +581,31 @@ void AccessibleAbilityConnection::Disconnect()
 void AccessibleAbilityConnection::Connect(const AppExecFwk::ElementName &element)
 {
     HILOG_DEBUG("start");
+    if (!accountData_) {
+        HILOG_ERROR("accountData_ is nullptr");
+        return;
+    }
     elementName_ = element;
     AAFwk::Want want = CreateWant(elementName_);
     HILOG_DEBUG("GetBundleName is %{public}s ", elementName_.GetBundleName().c_str());
     HILOG_DEBUG("GetAbilityName is %{public}s ", elementName_.GetAbilityName().c_str());
     HILOG_DEBUG("current accountId is %{public}d ", accountData_->GetAccountId());
 
-    int uid = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->GetBundleMgrProxy()->
-    GetUidByBundleName(elementName_.GetBundleName(), accountData_->GetAccountId());
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams || !aams->GetBundleMgrProxy()) {
+        HILOG_ERROR("get bundleMgr failed");
+        return;
+    }
+    int uid = aams->GetBundleMgrProxy()->GetUidByBundleName(
+        elementName_.GetBundleName(), accountData_->GetAccountId());
     HILOG_DEBUG("uid is %{public}d ", uid);
 
-    if (AAFwk::AbilityManagerClient::GetInstance()->ConnectAbility(
+    auto abilityManagerClient = AAFwk::AbilityManagerClient::GetInstance();
+    if (!abilityManagerClient) {
+        HILOG_ERROR("abilityManagerClient is nullptr");
+        return;
+    }
+    if (abilityManagerClient->ConnectAbility(
         want, this, nullptr, uid / UID_MASK) != ERR_OK) {
         HILOG_ERROR("ConnectAbility failed!");
         // temp deal: Remove this enabled ability from Setting
@@ -565,8 +644,13 @@ void AccessibleAbilityConnection::AccessibleAbilityConnectionDeathRecipient::OnR
         recipientAccountData_->RemoveInstalledAbility("ohos.uitest");
     }
 
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->UpdateAbilities();
-    DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->UpdateAccessibilityManagerService();
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr");
+        return;
+    }
+    aams->UpdateAbilities();
+    aams->UpdateAccessibilityManagerService();
     // temp deal: notify setting
 }
 } // namespace Accessibility

services/aams/src/accessible_ability_manager_service.cpp

@@ -138,6 +138,10 @@ bool AccessibleAbilityManagerService::Init()
     currentAccountId_ = TEMP_ACCOUNT_ID;
     HILOG_DEBUG("current accountId %{public}d", currentAccountId_);
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr.");
+        return false;
+    }
     accountData->init();
 
     HILOG_INFO("AddAbilityListener begin!");
@@ -163,8 +167,11 @@ void AccessibleAbilityManagerService::SendEvent(const AccessibilityEventInfo& ui
     AccessibilityEventInfo& event = const_cast<AccessibilityEventInfo&>(uiEvent);
     UpdateAccessibilityWindowStateByEvent(event);
 
+    if (!handler_) {
+        HILOG_ERROR("handler_ is nullptr.");
+        return;
+    }
     std::function<void()> sendEventFunc = std::bind(&AccessibleAbilityManagerService::SendEventInner, this, event);
-
     handler_->PostTask(sendEventFunc, TASK_SEND_EVENT);
 }
 
@@ -172,9 +179,15 @@ void AccessibleAbilityManagerService::SendEventInner(AccessibilityEventInfo& uiE
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr.");
+        return;
+    }
     map<string, sptr<AccessibleAbilityConnection>> abilities = accountData->GetConnectedA11yAbilities();
     for (auto& ability : abilities) {
-        ability.second->OnAccessibilityEvent(uiEvent);
+        if (ability.second) {
+            ability.second->OnAccessibilityEvent(uiEvent);
+        }
     }
 }
 
@@ -321,6 +334,10 @@ void AccessibleAbilityManagerService::DeregisterElementOperator(int windowId)
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr.");
+        return;
+    }
     sptr<AccessibilityWindowConnection> connection = accountData->GetAccessibilityWindowConnection(windowId);
     if (!connection) {
         HILOG_WARN("The operation of windowId[%{public}d] has not been registered.", windowId);
@@ -345,6 +362,10 @@ void AccessibleAbilityManagerService::InteractionOperationDeathRecipient::OnRemo
     HILOG_DEBUG("start");
     std::lock_guard<std::mutex> lock(mutex_);
     auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr.");
+        return;
+    }
     aams->DeregisterElementOperator(windowId_);
 }
 
@@ -352,6 +373,11 @@ CaptionProperty AccessibleAbilityManagerService::GetCaptionProperty()
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    CaptionProperty property;
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr.");
+        return property;
+    }
     return accountData->GetCaptionProperty();
 }
 
@@ -359,6 +385,10 @@ bool AccessibleAbilityManagerService::SetCaptionProperty(const CaptionProperty&
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr.");
+        return false;
+    }
     bool result = accountData->SetCaptionProperty(caption);
     UpdateCaptionProperty();
     return result;
@@ -368,6 +398,10 @@ bool AccessibleAbilityManagerService::SetCaptionState(const bool state)
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr.");
+        return false;
+    }
     bool result = accountData->SetCaptionState(state);
     UpdateAccessibilityState();
     return result;
@@ -377,6 +411,10 @@ bool AccessibleAbilityManagerService::SetEnabled(const bool state)
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr.");
+        return false;
+    }
     bool result = accountData->SetEnabled(state);
     UpdateAccessibilityState();
     return result;
@@ -413,9 +451,15 @@ void AccessibleAbilityManagerService::NotifyDisplayResizeStateChanged(
     int displayId, Rect& rect, float scale, float centerX, float centerY)
 {
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr.");
+        return;
+    }
     map<string, sptr<AccessibleAbilityConnection>> abilities = accountData->GetConnectedA11yAbilities();
     for (auto& ability : abilities) {
-        ability.second->OnDisplayResized(displayId, rect, scale, centerX, centerY);
+        if (ability.second) {
+            ability.second->OnDisplayResized(displayId, rect, scale, centerX, centerY);
+        }
     }
 }
 
@@ -511,6 +555,10 @@ void AccessibleAbilityManagerService::StateCallbackDeathRecipient::OnRemoteDied(
     }
     remote->RemoveDeathRecipient(this);
     auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr.");
+        return;
+    }
     sptr<AccessibilityAccountData> accountData = aams->GetCurrentAccountData();
     if (!accountData) {
         HILOG_ERROR("Current account data is null");
@@ -530,6 +578,10 @@ void AccessibleAbilityManagerService::CaptionPropertyCallbackDeathRecipient::OnR
     }
     remote->RemoveDeathRecipient(this);
     auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr.");
+        return;
+    }
     sptr<AccessibilityAccountData> accountData = aams->GetCurrentAccountData();
     if (!accountData) {
         HILOG_ERROR("Current account data is null");
@@ -548,7 +600,17 @@ void AccessibleAbilityManagerService::PresentUser()
 {
     HILOG_DEBUG();
 
-    GetCurrentAccountData()->ReadConfigurationForAccountData();
+    auto aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
+    if (!aams) {
+        HILOG_ERROR("aams is nullptr.");
+        return;
+    }
+    sptr<AccessibilityAccountData> accountData = aams->GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("Current account data is null");
+        return;
+    }
+    accountData->ReadConfigurationForAccountData();
     UpdateAbilities();
 }
 
@@ -557,13 +619,17 @@ void AccessibleAbilityManagerService::PackageRemoved(std::string& bundleName)
     HILOG_DEBUG("bundleName(%{public}s)", bundleName.c_str());
 
     sptr<AccessibilityAccountData> packageAccount = GetCurrentAccountData();
+    if (!packageAccount) {
+        HILOG_ERROR("packageAccount is nullptr.");
+        return;
+    }
     if (packageAccount->GetInstalledAbilities().empty()) {
         HILOG_DEBUG("There is no installed abilities.");
         return;
     }
     packageAccount->RemoveInstalledAbility(bundleName);
 
-    // remove enabled ability, remove connecting ability if it is connecting.
+    // Remove enabled ability, remove connecting ability if it is connecting.
     bool needUpdateAbility = false;
     std::map<std::string, AppExecFwk::ElementName> enabledAbilities = packageAccount->GetEnabledAbilities();
     if (enabledAbilities.empty()) {
@@ -578,7 +644,7 @@ void AccessibleAbilityManagerService::PackageRemoved(std::string& bundleName)
         }
     }
 
-    // remove connected ability
+    // Remove connected ability
     std::map<std::string, sptr<AccessibleAbilityConnection>> connectedAbilities =
         packageAccount->GetConnectedA11yAbilities();
     if (connectedAbilities.empty()) {
@@ -609,9 +675,19 @@ void AccessibleAbilityManagerService::PackageRemoved(std::string& bundleName)
 void AccessibleAbilityManagerService::PackageAdd(std::string& bundleName)
 {
     HILOG_DEBUG("bundleName(%{public}s)", bundleName.c_str());
+    sptr<AccessibilityAccountData> packageAccount = GetCurrentAccountData();
+    if (!packageAccount) {
+        HILOG_ERROR("packageAccount is nullptr");
+        return;
+    }
     bool hasNewExtensionAbility = false;
     std::vector<AppExecFwk::ExtensionAbilityInfo> extensionInfos;
-    GetBundleMgrProxy()->QueryExtensionAbilityInfos(
+    sptr<AppExecFwk::IBundleMgr> bundleMgrProxy = GetBundleMgrProxy();
+    if (!bundleMgrProxy) {
+        HILOG_ERROR("bundleMgrProxy is nullptr.");
+        return;
+    }
+    bundleMgrProxy->QueryExtensionAbilityInfos(
         AppExecFwk::ExtensionAbilityType::ACCESSIBILITY, GetCurrentAccountId(), extensionInfos);
     HILOG_DEBUG("query extensionAbilityInfos' size is %{public}d.", extensionInfos.size());
     for (auto newAbility : extensionInfos) {
@@ -623,9 +699,9 @@ void AccessibleAbilityManagerService::PackageAdd(std::string& bundleName)
                 HILOG_ERROR("accessibilityInfo is not null");
                 return;
             }
-            GetCurrentAccountData()->AddInstalledAbility(*accessibilityInfo);
+            packageAccount->AddInstalledAbility(*accessibilityInfo);
             HILOG_DEBUG("add new extension ability successfully and installed abilities's size is %{public}d",
-                GetCurrentAccountData()->GetInstalledAbilities().size());
+                packageAccount->GetInstalledAbilities().size());
             hasNewExtensionAbility = true;
             break;
         }
@@ -643,15 +719,24 @@ void AccessibleAbilityManagerService::PackageChanged(std::string& bundleName)
 
     bool hasChanged = false;
     sptr<AccessibilityAccountData> packageAccount = GetCurrentAccountData();
+    if (!packageAccount) {
+        HILOG_ERROR("packageAccount is nullptr");
+        return;
+    }
     if (packageAccount->GetInstalledAbilities().empty()) {
         HILOG_DEBUG("There is no installed abilities.");
         return;
     }
     packageAccount->RemoveInstalledAbility(bundleName);
 
-    // add installed ability
+    // Add installed ability
     std::vector<AppExecFwk::ExtensionAbilityInfo> extensionInfos;
-    GetBundleMgrProxy()->QueryExtensionAbilityInfos(
+    sptr<AppExecFwk::IBundleMgr> bundleMgrProxy = GetBundleMgrProxy();
+    if (!bundleMgrProxy) {
+        HILOG_ERROR("bundleMgrProxy is nullptr.");
+        return;
+    }
+    bundleMgrProxy->QueryExtensionAbilityInfos(
         AppExecFwk::ExtensionAbilityType::ACCESSIBILITY, GetCurrentAccountId(), extensionInfos);
     HILOG_DEBUG("query extensionAbilityInfos' size is %{public}d.", extensionInfos.size());
     for (auto changedAbility : extensionInfos) {
@@ -660,9 +745,9 @@ void AccessibleAbilityManagerService::PackageChanged(std::string& bundleName)
                 extension ability's name is %{public}s", changedAbility.name.c_str());
             std::shared_ptr<AccessibilityAbilityInfo> accessibilityInfo =
                 std::make_shared<AccessibilityAbilityInfo>(changedAbility);
-            GetCurrentAccountData()->AddInstalledAbility(*accessibilityInfo);
+            packageAccount->AddInstalledAbility(*accessibilityInfo);
             HILOG_DEBUG("update new extension ability successfully and installed abilities's size is %{public}d",
-                GetCurrentAccountData()->GetInstalledAbilities().size());
+                packageAccount->GetInstalledAbilities().size());
             hasChanged = true;
             break;
         }
@@ -678,6 +763,10 @@ void AccessibleAbilityManagerService::PackageUpdateFinished(std::string& bundleN
 {
     HILOG_DEBUG("bundleName(%{public}s)", bundleName.c_str());
     sptr<AccessibilityAccountData> packageAccount = GetCurrentAccountData();
+    if (!packageAccount) {
+        HILOG_ERROR("packageAccount is nullptr");
+        return;
+    }
     if (packageAccount->GetConnectingA11yAbilities().empty()) {
         return;
     }
@@ -747,7 +836,7 @@ void AccessibleAbilityManagerService::UpdateAbilities()
         HILOG_DEBUG("installAbility's packageName is %{public}s", installAbility.GetPackageName().c_str());
         HILOG_DEBUG("installAbility's abilityName is %{public}s", installAbility.GetName().c_str());
         std::string elementName = "/" + installAbility.GetPackageName() + "/"; // temp deal
-        // wait for the connecting ability.
+        // Wait for the connecting ability.
         if (accountData->GetConnectingA11yAbilities().count(elementName)) {
             continue;
         }
@@ -781,7 +870,9 @@ void AccessibleAbilityManagerService::UpdateAccessibilityState()
     }
     uint32_t state = accountData->GetAccessibilityState();
     for (auto& callback : accountData->GetStateCallbacks()) {
-        callback->OnStateChanged(state);
+        if (callback) {
+            callback->OnStateChanged(state);
+        }
     }
 }
 
@@ -797,7 +888,9 @@ void AccessibleAbilityManagerService::UpdateCaptionProperty()
 
     CaptionProperty caption = accountData->GetCaptionProperty();
     for (auto& callback : accountData->GetCaptionPropertyCallbacks()) {
-        callback->OnCaptionPropertyChanged(caption);
+        if (callback) {
+            callback->OnCaptionPropertyChanged(caption);
+        }
     }
 }
 
@@ -848,11 +941,15 @@ void AccessibleAbilityManagerService::UpdateMagnification()
 
     if (accountData->GetScreenMagnificationFlag()) {
         for (sptr<Rosen::Display> displayReg : displays) {
-            AccessibilityZoomProxy::GetInstance().Register(displayReg->GetId());
+            if (displayReg) {
+                AccessibilityZoomProxy::GetInstance().Register(displayReg->GetId());
+            }
         }
     } else {
         for (sptr<Rosen::Display> displayUnreg : displays) {
-            AccessibilityZoomProxy::GetInstance().Unregister(displayUnreg->GetId());
+            if (displayUnreg) {
+                AccessibilityZoomProxy::GetInstance().Unregister(displayUnreg->GetId());
+            }
         }
     }
 }
@@ -861,7 +958,7 @@ void AccessibleAbilityManagerService::UpdateWindowChangeListener()
 {
     HILOG_DEBUG("start.");
 
-    bool isWindowRetrieve = true; // this is a temp deal for test
+    bool isWindowRetrieve = true; // This is a temp deal for test
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
     if (!accountData) {
         HILOG_ERROR("Account data is null");
@@ -870,6 +967,10 @@ void AccessibleAbilityManagerService::UpdateWindowChangeListener()
 
     auto connectedA11yAbilities = accountData->GetConnectedA11yAbilities();
     for (auto itr = connectedA11yAbilities.begin(); itr != connectedA11yAbilities.end(); itr++) {
+        if (!itr->second) {
+            HILOG_ERROR("ability is null");
+            continue;
+        }
         if (itr->second->GetAbilityInfo().GetCapabilityValues() & Capability::CAPABILITY_RETRIEVE) {
             isWindowRetrieve = true;
             break;
@@ -889,6 +990,10 @@ bool AccessibleAbilityManagerService::GetEnabledState()
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     bool result = accountData->GetEnabledState();
     return result;
 }
@@ -897,6 +1002,10 @@ bool AccessibleAbilityManagerService::GetCaptionState()
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     bool result = accountData->GetCaptionState();
     return result;
 }
@@ -905,6 +1014,10 @@ bool AccessibleAbilityManagerService::GetTouchGuideState()
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     bool result = accountData->GetTouchGuideState();
     return result;
 }
@@ -913,6 +1026,10 @@ bool AccessibleAbilityManagerService::GetGestureState()
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     bool result = accountData->GetGestureState();
     return result;
 }
@@ -921,6 +1038,10 @@ bool AccessibleAbilityManagerService::GetKeyEventObserverState()
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     bool result = accountData->GetKeyEventObserverState();
     return result;
 }
@@ -929,6 +1050,10 @@ bool AccessibleAbilityManagerService::SetTouchGuideState(const bool state)
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     bool result = accountData->SetTouchGuideState(state);
     return result;
 }
@@ -937,6 +1062,10 @@ bool AccessibleAbilityManagerService::SetGestureState(const bool state)
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     bool result = accountData->SetGestureState(state);
     UpdateAccessibilityState();
     return result;
@@ -946,6 +1075,10 @@ bool AccessibleAbilityManagerService::SetKeyEventObserverState(const bool state)
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     bool result = accountData->SetKeyEventObserverState(state);
     UpdateAccessibilityState();
     return result;
@@ -955,6 +1088,10 @@ bool AccessibleAbilityManagerService::SetEnabledObj(std::map<std::string, AppExe
 {
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     bool result = accountData->SetEnabledObj(it);
     UpdateAbilities();
     return result;
@@ -965,6 +1102,10 @@ std::map<std::string, AppExecFwk::ElementName> AccessibleAbilityManagerService::
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
     std::map<std::string, AppExecFwk::ElementName> it {};
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return it;
+    }
     it = accountData->GetEnabledAbilities();
     return it;
 }
@@ -974,6 +1115,10 @@ std::vector<AccessibilityAbilityInfo> AccessibleAbilityManagerService::GetInstal
     HILOG_DEBUG("start");
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
     std::vector<AccessibilityAbilityInfo> it {};
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return it;
+    }
     it = accountData->GetInstalledAbilities();
     return it;
 }
@@ -981,6 +1126,10 @@ std::vector<AccessibilityAbilityInfo> AccessibleAbilityManagerService::GetInstal
 bool AccessibleAbilityManagerService::DisableAbilities(std::map<std::string, AppExecFwk::ElementName> it)
 {
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr.");
+        return false;
+    }
     bool result = accountData->DisableAbilities(it);
     UpdateAbilities();
     return result;
@@ -989,13 +1138,22 @@ bool AccessibleAbilityManagerService::DisableAbilities(std::map<std::string, App
 bool AccessibleAbilityManagerService::RegisterUITestAbilityConnectionClient(const sptr<IRemoteObject>& obj)
 {
     HILOG_DEBUG("start");
+    sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     std::string uiTestUri = "/" + UI_TEST_BUNDLE_NAME + "/" + UI_TEST_ABILITY_NAME;
-    sptr<AccessibleAbilityConnection> connection = GetCurrentAccountData()->GetAccessibleAbilityConnection(uiTestUri);
+    sptr<AccessibleAbilityConnection> connection = accountData->GetAccessibleAbilityConnection(uiTestUri);
     if (connection) {
         HILOG_ERROR("connection is existed!!");
         return false;
     }
 
+    if (!handler_) {
+        HILOG_ERROR("handler_ is nullptr.");
+        return false;
+    }
     std::function<void()> addUITestClientFunc =
         std::bind(&AccessibleAbilityManagerService::AddUITestClient, this, obj);
     handler_->PostTask(addUITestClientFunc, "AddUITestClient");
@@ -1006,21 +1164,25 @@ void AccessibleAbilityManagerService::AddUITestClient(const sptr<IRemoteObject>&
 {
     HILOG_DEBUG("start");
     auto currentAccountData = GetCurrentAccountData();
+    if (!currentAccountData) {
+        HILOG_ERROR("currentAccountData is nullptr");
+        return;
+    }
 
-    // add installed ability
+    // Add installed ability
     sptr<AccessibilityAbilityInfo> abilityInfo = new(std::nothrow) AccessibilityAbilityInfo();
     if (!abilityInfo) {
         HILOG_ERROR("abilityInfo is null");
         return;
     }
     abilityInfo->SetPackageName(UI_TEST_BUNDLE_NAME);
-    uint32_t capabilities = CAPABILITY_RETRIEVE | CAPABILITY_KEY_EVENT_OBSERVER | CAPABILITY_GESTURE;
+    uint32_t capabilities = CAPABILITY_RETRIEVE | CAPABILITY_GESTURE;
     abilityInfo->SetCapabilityValues(capabilities);
     abilityInfo->SetAccessibilityAbilityType(ACCESSIBILITY_ABILITY_TYPE_ALL);
     abilityInfo->SetEventTypes(EventType::TYPES_ALL_MASK);
     currentAccountData->AddInstalledAbility(*abilityInfo);
 
-    // add connected ability
+    // Add connected ability
     sptr<AppExecFwk::ElementName> elementName = new(std::nothrow) AppExecFwk::ElementName();
     if (!elementName) {
         HILOG_ERROR("elementName is null");
@@ -1040,12 +1202,21 @@ void AccessibleAbilityManagerService::AddUITestClient(const sptr<IRemoteObject>&
 bool AccessibleAbilityManagerService::DeregisterUITestAbilityConnectionClient()
 {
     HILOG_DEBUG("start");
+    sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return false;
+    }
     std::string uiTestUri = "/" + UI_TEST_BUNDLE_NAME + "/" + UI_TEST_ABILITY_NAME;
-    sptr<AccessibleAbilityConnection> connection = GetCurrentAccountData()->GetAccessibleAbilityConnection(uiTestUri);
+    sptr<AccessibleAbilityConnection> connection = accountData->GetAccessibleAbilityConnection(uiTestUri);
     if (!connection) {
         HILOG_ERROR("connection is not existed!!");
         return false;
     }
+    if (!handler_) {
+        HILOG_ERROR("handler_ is nullptr.");
+        return false;
+    }
     std::function<void()> removeUITestClientFunc =
         std::bind(&AccessibleAbilityManagerService::RemoveUITestClient, this, connection);
     handler_->PostTask(removeUITestClientFunc, "RemoveUITestClient");
@@ -1055,7 +1226,16 @@ bool AccessibleAbilityManagerService::DeregisterUITestAbilityConnectionClient()
 void AccessibleAbilityManagerService::RemoveUITestClient(sptr<AccessibleAbilityConnection>& connection)
 {
     HILOG_DEBUG("start");
-    GetCurrentAccountData()->RemoveInstalledAbility(UI_TEST_BUNDLE_NAME);
+    if (!connection) {
+        HILOG_ERROR("connection is nullptr");
+        return;
+    }
+    sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return;
+    }
+    accountData->RemoveInstalledAbility(UI_TEST_BUNDLE_NAME);
     connection->OnAbilityDisconnectDone(connection->GetElementName(), 0);
 }
 
@@ -1068,6 +1248,10 @@ void AccessibleAbilityManagerService::OnAddSystemAbility(int32_t systemAbilityId
 {
     HILOG_DEBUG("systemAbilityId:%{public}d added!", systemAbilityId);
     sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
+    if (!accountData) {
+        HILOG_ERROR("accountData is nullptr");
+        return;
+    }
     switch (systemAbilityId) {
         case COMMON_EVENT_SERVICE_ID:
             // Register common event

services/aams/test/mock/accessibility_ability_info_mock.cpp

@@ -54,11 +54,10 @@ void AccessibilityAbilityInfo::SetPackageName(string bundleName)
 
 AccessibilityAbilityInfo::AccessibilityAbilityInfo(const ExtensionAbilityInfo &abilityInfo)
 {
-    // CAPABILITY_KEY_EVENT_OBSERVER | CAPABILITY_TOUCH_GUIDE | CAPABILITY_ZOOM |
-    // CAPABILITY_RETRIEVE | CAPABILITY_GESTURE
-    uint32_t capabilities = 0x0008 | 0x0002 | 0x0010 | 0x0001 | 0x0020;
+    uint32_t capabilities = CAPABILITY_KEY_EVENT_OBSERVER | CAPABILITY_TOUCH_GUIDE |
+        CAPABILITY_ZOOM | CAPABILITY_RETRIEVE;
     capabilities_ = capabilities;
-    eventTypes_ = 0xFFFFFFFF;   // TYPES_ALL_MASK
+    eventTypes_ = 0xFFFFFFFF; // TYPES_ALL_MASK
     name_ = abilityInfo.name;
     bundleName_ = abilityInfo.bundleName;
 }

services/aams/test/mock/accessibility_window_info_mock.cpp

@@ -22,7 +22,6 @@ AccessibilityWindowInfo::AccessibilityWindowInfo()
 {
 }
 
-/* AccessibleAction Parcel struct */
 bool AccessibilityWindowInfo::ReadFromParcel(Parcel &parcel)
 {
     int windowType;

services/aams/test/mock/accessible_ability_manager_service_mock.cpp

@@ -263,7 +263,7 @@ void AccessibleAbilityManagerService::UpdateAbilities()
                                         installAbility.GetPackageName(),
                                         installAbility.GetName());
         std::string elementName =  element.GetURI();
-        // wait for the connecting ability.
+        // Wait for the connecting ability.
         if (accountData->GetConnectingA11yAbilities().count(elementName)) {
             continue;
         }

services/aams/test/mock/mock_bundle_manager.cpp

@@ -104,7 +104,7 @@ bool BundleMgrService::CheckWantEntity(const AAFwk::Want &want, AbilityInfo &abi
     }
 
     auto find = false;
-    // filter ams onstart
+    // Filter ams onstart
     HILOG_DEBUG(" mock BundleMgrService QueryAbilityInfo CheckWantEntity ------------ start---------2");
     for (const auto &entity : entityVector) {
         if (entity == Want::FLAG_HOME_INTENT_FROM_SYSTEM && element.GetAbilityName().empty() &&

services/aams/test/unittest/accessibility_account_data_test.cpp

@@ -70,7 +70,7 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetAcce
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_GetAccessibilityState001 start";
     int accountId = 1;
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
-    /* Initial state */
+    // Initial state
     accountData->SetTouchGuideState(true);
     int stateType = accountData->GetAccessibilityState();
     int stateTypeTest = AccessibilitySystemAbilityClient::STATE_EXPLORATION_ENABLED;
@@ -93,7 +93,7 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetAcce
     sptr<AccessibleAbilityConnection> connection = new AccessibleAbilityConnection(accountData, connectCounter++,
         *abilityInfo);
     EXPECT_EQ(0, (int)accountData->GetConnectedA11yAbilities().size());
-    /* add connected ability */
+    // Add connected ability
     accountData->AddConnectedAbility(connection);
     const std::string elementName = connection->GetElementName().GetURI();
     EXPECT_EQ(connection, accountData->GetAccessibleAbilityConnection(elementName));
@@ -123,7 +123,7 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetAcce
     sptr<AccessibleAbilityConnection> connection = new AccessibleAbilityConnection(accountData, connectCounter++,
         *abilityInfo);
     EXPECT_EQ(0, (int)accountData->GetConnectingA11yAbilities().size());
-    /* add connecting A11y ability */
+    // Add connecting A11y ability
     const AppExecFwk::ElementName elementName("aaa", "bbb", "ccc");
     accountData->AddConnectingA11yAbility(elementName);
     bool test = accountData->GetConnectingA11yAbilities().find(elementName.GetURI()) !=
@@ -156,9 +156,9 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetAcce
     sptr<AccessibleAbilityConnection> connection = new AccessibleAbilityConnection(accountData, connectCounter++,
         *abilityInfo);
     const AppExecFwk::ElementName elementName("aaa", "bbb", "ccc");
-    /* add connected ability */
+    // Add connected ability
     accountData->AddConnectedAbility(connection);
-    /* add connecting A11y ability */
+    // Add connecting A11y ability
     accountData->AddConnectingA11yAbility(elementName);
 
     accountData->SetGestureState(true);
@@ -186,7 +186,7 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_AddConn
     sptr<AccessibleAbilityConnection> connection = new AccessibleAbilityConnection(accountData, connectCounter++,
         *abilityInfo);
     EXPECT_EQ(0, (int)accountData->GetConnectedA11yAbilities().size());
-    /* add connected ability */
+    // Add connected ability
     accountData->AddConnectedAbility(connection);
     const std::string elementName = connection->GetElementName().GetURI();
     EXPECT_EQ(connection, accountData->GetAccessibleAbilityConnection(elementName));
@@ -210,12 +210,12 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_RemoveC
     sptr<AccessibleAbilityConnection> connection = new AccessibleAbilityConnection(accountData, connectCounter++,
         *abilityInfo);
     EXPECT_EQ(0, (int)accountData->GetConnectedA11yAbilities().size());
-    /* add */
+    // Add
     accountData->AddConnectedAbility(connection);
     EXPECT_EQ(1, (int)accountData->GetConnectedA11yAbilities().size());
     const std::string elementName = connection->GetElementName().GetURI();
     EXPECT_EQ(connection, accountData->GetAccessibleAbilityConnection(elementName));
-    /* remove */
+    // Remove
     accountData->RemoveConnectedAbility(connection);
     EXPECT_EQ(0, (int)accountData->GetConnectedA11yAbilities().size());
 
@@ -237,14 +237,14 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_Ability
     sptr<AccessibleAbilityConnection> connection = new AccessibleAbilityConnection(accountData, connectCounter++,
         *abilityInfo);
     EXPECT_EQ(0, (int)accountData->GetConnectedA11yAbilities().size());
-    /* add */
+    // Add
     accountData->AddConnectedAbility(connection);
     const std::string elementNameURI = connection->GetElementName().GetURI();
     EXPECT_EQ(1, (int)accountData->GetConnectedA11yAbilities().size());
     EXPECT_EQ(connection, accountData->GetAccessibleAbilityConnection(elementNameURI));
 
     EXPECT_EQ(0, (int)accountData->GetConnectingA11yAbilities().size());
-    /* disconnect */
+    // Disconnect
     accountData->RemoveConnectedAbility(connection);
     EXPECT_EQ(0, (int)accountData->GetConnectedA11yAbilities().size());
     AppExecFwk::ElementName& elementName = connection->GetElementName();
@@ -268,13 +268,13 @@ HWTEST_F(AccessibilityAccountDataTest,
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
     const AppExecFwk::ElementName elementName("aaa", "bbb", "ccc");
     EXPECT_EQ(0, (int)accountData->GetConnectingA11yAbilities().size());
-    /* add connecting A11y ability */
+    // Add connecting A11y ability
     accountData->AddConnectingA11yAbility(elementName);
     EXPECT_EQ(1, (int)accountData->GetConnectingA11yAbilities().size());
     bool test = accountData->GetConnectingA11yAbilities().find(elementName.GetURI()) !=
         accountData->GetConnectingA11yAbilities().end();
     EXPECT_TRUE(test);
-    /* remove */
+    // Remove
     accountData->RemoveConnectingA11yAbility(elementName);
     EXPECT_EQ(0, (int)accountData->GetConnectingA11yAbilities().size());
 
@@ -293,7 +293,7 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_AddEnab
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
     const AppExecFwk::ElementName elementName("aaa", "bbb", "ccc");
     EXPECT_EQ(0, (int)accountData->GetEnabledAbilities().size());
-    /* add */
+    // Add
     accountData->AddEnabledAbility(elementName);
     EXPECT_EQ(1, (int)accountData->GetEnabledAbilities().size());
     bool test =
@@ -315,13 +315,13 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_RemoveE
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
     const AppExecFwk::ElementName elementName("aaa", "bbb", "ccc");
     EXPECT_EQ(0, (int)accountData->GetEnabledAbilities().size());
-    /* add */
+    // Add
     accountData->AddEnabledAbility(elementName);
     EXPECT_EQ(1, (int)accountData->GetEnabledAbilities().size());
     bool test =
         accountData->GetEnabledAbilities().find(elementName.GetURI()) != accountData->GetEnabledAbilities().end();
     EXPECT_TRUE(test);
-    /* remove */
+    // Remove
     accountData->RemoveEnabledAbility(elementName);
     EXPECT_EQ(0, (int)accountData->GetEnabledAbilities().size());
 
@@ -342,7 +342,7 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_AddInst
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo(info);
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
     EXPECT_EQ(0, (int)accountData->GetInstalledAbilities().size());
-    /* add */
+    // Add
     accountData->AddInstalledAbility(*abilityInfo);
     EXPECT_EQ(1, (int)accountData->GetInstalledAbilities().size());
 
@@ -361,10 +361,10 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_RemoveI
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo();
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
     EXPECT_EQ(0, (int)accountData->GetInstalledAbilities().size());
-    /* add */
+    // Add
     accountData->AddInstalledAbility(*abilityInfo);
     EXPECT_EQ(1, (int)accountData->GetInstalledAbilities().size());
-    /* remove */
+    // Remove
     accountData->RemoveInstalledAbility(abilityInfo->GetPackageName());
     EXPECT_EQ(0, (int)accountData->GetInstalledAbilities().size());
 
@@ -383,10 +383,10 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_ClearIn
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo();
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
     EXPECT_EQ(0, (int)accountData->GetInstalledAbilities().size());
-    /* add */
+    / Add
     accountData->AddInstalledAbility(*abilityInfo);
     EXPECT_EQ(1, (int)accountData->GetInstalledAbilities().size());
-    /* clear */
+    // Clear
     accountData->ClearInstalledAbility();
     EXPECT_EQ(0, (int)accountData->GetInstalledAbilities().size());
 
@@ -412,7 +412,7 @@ HWTEST_F(AccessibilityAccountDataTest,
     accountData->AddConnectedAbility(connection);
     EXPECT_EQ(1, (int)accountData->GetConnectedA11yAbilities().size());
     const std::string elementName = connection->GetElementName().GetURI();
-    /* get */
+    // Get
     EXPECT_EQ(connection, accountData->GetAccessibleAbilityConnection(elementName));
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_GetAccessibleAbilityConnection001 end";
 }
@@ -434,7 +434,7 @@ HWTEST_F(AccessibilityAccountDataTest,
         *abilityInfo);
     accountData->AddConnectedAbility(connection);
     const std::string elementName = "111name";
-    /* get */
+    // Get
     EXPECT_EQ(nullptr, accountData->GetAccessibleAbilityConnection(elementName));
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_GetAccessibleAbilityConnection002 end";
 }
@@ -453,12 +453,12 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetConn
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo();
     sptr<AccessibleAbilityConnection> connection = new AccessibleAbilityConnection(accountData, connectCounter++,
         *abilityInfo);
-    /* get */
+    // Get
     int size = accountData->GetConnectedA11yAbilities().size();
     EXPECT_EQ(0, size);
-    /* add */
+    // Add
     accountData->AddConnectedAbility(connection);
-    /* get */
+    // Get
     EXPECT_EQ(1, (int)accountData->GetConnectedA11yAbilities().size());
 
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_GetConnectedA11yAbilities001 end";
@@ -476,12 +476,12 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetStat
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
     sptr<AccessibleAbilityManagerServiceStateStub> stub = new AccessibleAbilityManagerServiceStateStub();
     const sptr<IAccessibleAbilityManagerServiceState> state = new AccessibleAbilityManagerServiceStateProxy(stub);
-    /* get */
+    // Get
     int size = accountData->GetStateCallbacks().size();
     EXPECT_EQ(0, size);
-    /* add */
+    // Add
     accountData->AddStateCallback(state);
-    /* get */
+    // Get
     EXPECT_EQ(1, (int)accountData->GetStateCallbacks().size());
 
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_GetStateCallbacks001 end";
@@ -497,7 +497,7 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetAsac
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_GetAsacConnections001 start";
     const int accountId = 1;
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
-    /* get */
+    // Get
     int size = accountData->GetAsacConnections().size();
     EXPECT_EQ(0, size);
 
@@ -506,9 +506,9 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetAsac
     sptr<IAccessibilityElementOperator> operation = new AccessibilityElementOperatorProxy(operationStub);
     sptr<AccessibilityWindowConnection> operationConnection = new AccessibilityWindowConnection(windowId,
         operation, accountId);
-    /* add asacConnections */
+    // Add asacConnections
     accountData->AddAccessibilityWindowConnection(windowId, operationConnection);
-    /* get */
+    // Get
     EXPECT_EQ(1, (int)accountData->GetAsacConnections().size());
 
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_GetAsacConnections001 end";
@@ -541,14 +541,13 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetAbil
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
     sptr<AccessibleAbilityConnection> connection = new AccessibleAbilityConnection(accountData, connectCounter++,
         *abilityInfo);
-    /* add connected ability */
+    // Add connected ability
     EXPECT_EQ(0, (int)accountData->GetConnectedA11yAbilities().size());
     accountData->AddConnectedAbility(connection);
     EXPECT_EQ(1, (int)accountData->GetConnectedA11yAbilities().size());
-    /* ABILITY_STATE_ENABLE */
     int stateType = AbilityStateType::ABILITY_STATE_ENABLE;
     AbilityStateType state = static_cast<AbilityStateType>(stateType);
-    /* get ability */
+    // Get ability
     std::vector<AccessibilityAbilityInfo> enabledAbilities = accountData->GetAbilitiesByState(state);
     EXPECT_EQ(1, (int)enabledAbilities.size());
     EXPECT_EQ(connection->GetAbilityInfo().GetPackageName(), enabledAbilities.begin()->GetPackageName());
@@ -575,18 +574,17 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_GetAbil
     sptr<AccessibleAbilityConnection> connection = new AccessibleAbilityConnection(accountData, connectCounter++,
         *abilityInfo);
     EXPECT_NE(abilityInfo->GetId(), installAbilityInfo->GetId());
-    /* add connected ability */
+    // Add connected ability
     EXPECT_EQ(0, (int)accountData->GetConnectedA11yAbilities().size());
     accountData->AddConnectedAbility(connection);
     EXPECT_EQ(1, (int)accountData->GetConnectedA11yAbilities().size());
-    /* add install ability */
+    // Add install ability
     EXPECT_EQ(0, (int)accountData->GetInstalledAbilities().size());
     accountData->AddInstalledAbility(*installAbilityInfo);
     EXPECT_EQ(1, (int)accountData->GetInstalledAbilities().size());
-    /* ABILITY_STATE_DISABLE */
     int stateType = AbilityStateType::ABILITY_STATE_DISABLE;
     AbilityStateType state = static_cast<AbilityStateType>(stateType);
-    /* get ability */
+    // Get ability
     std::vector<AccessibilityAbilityInfo> disabledAbilities = accountData->GetAbilitiesByState(state);
     EXPECT_EQ(1, (int)disabledAbilities.size());
 
@@ -610,10 +608,8 @@ HWTEST_F(AccessibilityAccountDataTest,
     sptr<AccessibilityWindowConnection> connection = new AccessibilityWindowConnection(windowId,
         operation, accountId);
     EXPECT_EQ(0, (int)accountData->GetAsacConnections().size());
-    /* add */
     accountData->AddAccessibilityWindowConnection(windowId, connection);
     EXPECT_EQ(1, (int)accountData->GetAsacConnections().size());
-    /* get */
     EXPECT_EQ(connection, accountData->GetAccessibilityWindowConnection(windowId));
 
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_AddAccessibilityWindowConnection001 end";
@@ -637,10 +633,8 @@ HWTEST_F(AccessibilityAccountDataTest,
     sptr<AccessibilityWindowConnection> connection = new AccessibilityWindowConnection(windowId,
         operation, accountId);
     EXPECT_EQ(0, (int)accountData->GetAsacConnections().size());
-    /* add */
     accountData->AddAccessibilityWindowConnection(windowId, connection);
     EXPECT_EQ(1, (int)accountData->GetAsacConnections().size());
-    /* get */
     EXPECT_EQ(nullptr, accountData->GetAccessibilityWindowConnection(windowIdTest));
 
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_GetAccessibilityWindowConnection001 end";
@@ -663,10 +657,8 @@ HWTEST_F(AccessibilityAccountDataTest,
     sptr<AccessibilityWindowConnection> connection = new AccessibilityWindowConnection(windowId,
         operation, accountId);
     EXPECT_EQ(0, (int)accountData->GetAsacConnections().size());
-    /* add */
     accountData->AddAccessibilityWindowConnection(windowId, connection);
     EXPECT_EQ(1, (int)accountData->GetAsacConnections().size());
-    /* remove */
     accountData->RemoveAccessibilityWindowConnection(windowId);
     EXPECT_EQ(0, (int)accountData->GetAsacConnections().size());
 
@@ -697,25 +689,25 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_SetCapt
 HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_OnAccountSwitched001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityAccountData_Unittest_OnAccountSwitched001 start";
-    // new accountData
+    // New accountData
     const int accountId = 101;
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
-    // new abilityInfo
+    // New abilityInfo
     AppExecFwk::ExtensionAbilityInfo info;
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo(info);
     abilityInfo->SetCapabilityValues(
         CAPABILITY_RETRIEVE | CAPABILITY_TOUCH_GUIDE | CAPABILITY_GESTURE |
         CAPABILITY_KEY_EVENT_OBSERVER | CAPABILITY_ZOOM);
-    // new AAconnection
+    // New AAconnection
     sptr<AccessibleAbilityConnection> AAConnection = new AccessibleAbilityConnection(accountData, 0, *abilityInfo);
-    // new aastub
+    // New aastub
     sptr<AccessibleAbilityClientStubImpl> aastub = new AccessibleAbilityClientStubImpl();
     GTEST_LOG_(INFO) << "OnAbilityConnectDone start !!!!!";
     const AppExecFwk::ElementName elementName("aaa", "bbb", "ccc");
     AAConnection->OnAbilityConnectDone(elementName, aastub, 0);
     GTEST_LOG_(INFO) << "add connected A11y Ability";
     EXPECT_EQ(1, (int)accountData->GetConnectedA11yAbilities().size());
-    /* CapabilityValues */
+    // CapabilityValues
     accountData->UpdateAccountCapabilities();
     bool test1 = accountData->GetGesturesSimulationFlag();
     EXPECT_TRUE(test1);
@@ -725,10 +717,10 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_OnAccou
     EXPECT_TRUE(test3);
     bool test4 = accountData->GetScreenMagnificationFlag();
     EXPECT_TRUE(test4);
-    /* Account Switched */
+    // Account Switched
     GTEST_LOG_(INFO) << "OnAccountSwitched";
     accountData->OnAccountSwitched();
-    /* initialization */
+    // Initialization
     EXPECT_EQ(0, (int)accountData->GetConnectedA11yAbilities().size());
     bool test5 = accountData->GetGesturesSimulationFlag();
     EXPECT_FALSE(test5);
@@ -753,7 +745,7 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_AddConn
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
     const AppExecFwk::ElementName elementName("aaa", "bbb", "ccc");
     EXPECT_EQ(0, (int)accountData->GetConnectingA11yAbilities().size());
-    /* add connecting A11y ability */
+    // Add connecting A11y ability
     accountData->AddConnectingA11yAbility(elementName);
     EXPECT_EQ(1, (int)accountData->GetConnectingA11yAbilities().size());
     bool test = accountData->GetConnectingA11yAbilities().find(elementName.GetURI()) !=
@@ -860,10 +852,7 @@ HWTEST_F(AccessibilityAccountDataTest, AccessibilityAccountData_Unittest_SetEnab
     sptr<AccessibilityAccountData> accountData = new AccessibilityAccountData(accountId);
 
     const AppExecFwk::ElementName elementName("aaa", "TEST_BUNDLE_NAME", "ccc");
-
-    /* add */
     accountData->AddEnabledAbility(elementName);
-    /* get */
     EXPECT_EQ(1, (int)accountData->GetEnabledAbilities().size());
 
     bool test = accountData->SetEnabledObj(accountData->GetEnabledAbilities());

services/aams/test/unittest/accessibility_common_event_registry_test.cpp

@@ -55,7 +55,7 @@ void AccessibilityCommonEventRegistryUnitTest::TearDownTestCase()
 void AccessibilityCommonEventRegistryUnitTest::SetUp()
 {
     GTEST_LOG_(INFO) << "SetUp";
-    // register bundleservice
+    // Register bundleservice
     mock_ = new OHOS::AppExecFwk::BundleMgrService();
     sptr<ISystemAbilityManager> systemAbilityManager =
         SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();

services/aams/test/unittest/accessibility_input_interceptor_test.cpp

@@ -181,7 +181,7 @@ HWTEST_F(AccessibilityInputInterceptorTest, AccessibilityInputInterceptorTest_Un
     if (inputEventConsumer != nullptr) {
         inputEventConsumer->OnInputEvent(event);
     }
-    /* wait ProcessTouchEvent */
+    // Wait ProcessTouchEvent
     sleep(3);
 
     GTEST_LOG_(INFO) << "AccessibilityInputInterceptorTest_Unittest_OnTouchEvent002 end";
@@ -213,7 +213,7 @@ HWTEST_F(AccessibilityInputInterceptorTest, AccessibilityInputInterceptorTest_Un
     if (inputEventConsumer != nullptr) {
         inputEventConsumer->OnInputEvent(event);
     }
-    /* wait ProcessTouchEvent */
+    // Wait ProcessTouchEvent
     sleep(3);
 
     GTEST_LOG_(INFO) << "AccessibilityInputInterceptorTest_Unittest_OnTouchEvent003 end";
@@ -264,7 +264,7 @@ HWTEST_F(AccessibilityInputInterceptorTest, AccessibilityInputInterceptorTest_Un
     if (inputEventConsumer != nullptr) {
         inputEventConsumer->OnInputEvent(event);
     }
-    /* wait ProcessMouseEvent */
+    // Wait ProcessMouseEvent
     sleep(3);
 
     GTEST_LOG_(INFO) << "AccessibilityInputInterceptorTest_Unittest_OnMouseEvent002 end";
@@ -294,7 +294,7 @@ HWTEST_F(AccessibilityInputInterceptorTest, AccessibilityInputInterceptorTest_Un
     if (inputEventConsumer != nullptr) {
         inputEventConsumer->OnInputEvent(event);
     }
-    /* wait ProcessMouseEvent */
+    // Wait ProcessMouseEvent
     sleep(3);
 
     GTEST_LOG_(INFO) << "AccessibilityInputInterceptorTest_Unittest_OnMouseEvent003 end";
@@ -331,7 +331,7 @@ HWTEST_F(AccessibilityInputInterceptorTest, AccessibilityInputInterceptorTest_Un
     keyEvent->AddKeyItem(item);
     keyEvent->SetKeyCode(1);
 
-    /* wait ProcessKeyEvent */
+    // Wait ProcessKeyEvent
     sleep(3);
 
     GTEST_LOG_(INFO) << "AccessibilityInputInterceptorTest_Unittest_OnKeyEvent002 end";
@@ -355,7 +355,7 @@ HWTEST_F(AccessibilityInputInterceptorTest, AccessibilityInputInterceptorTest_Un
     keyEvent->AddKeyItem(item);
     keyEvent->SetKeyCode(1);
 
-    /* wait ProcessKeyEvent */
+    // Wait ProcessKeyEvent
     sleep(3);
 
     GTEST_LOG_(INFO) << "AccessibilityInputInterceptorTest_Unittest_OnKeyEvent003 end";

services/aams/test/unittest/accessibility_interaction_bridge_test.cpp

@@ -105,12 +105,11 @@ HWTEST_F(AccessibilityInteractionBridgeTest, FindFocusedElementInfo_001, TestSiz
 HWTEST_F(AccessibilityInteractionBridgeTest, GetPointerItermOfAccessibilityFocusClick_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityInteractionBridgeTest_GetPointerItermOfAccessibilityFocusClick_001 start";
-    // regist InteractionConnection
+    // Regist InteractionConnection
     sptr<AccessibilityElementOperatorStub> aamsInteractionOperator = new AccessibilityElementOperatorStub();
     ins_->RegisterElementOperator(0, aamsInteractionOperator, 0);
     // Set window info
     sptr<Rosen::WindowInfo> winInfo = new Rosen::WindowInfo();
-    // auto AccessibilityWindowInfoManager::GetInstance() = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfoManager::GetInstance().activeWindowId_ = 0;
     int windowId = 0;
     AccessibilityWindowInfo info =

services/aams/test/unittest/accessibility_keyevent_filter_test.cpp

@@ -82,7 +82,7 @@ void KeyEventFilterUnitTest::AddConnection()
     sptr<AccessibleAbilityClientStubImpl> stub = new AccessibleAbilityClientStubImpl();
     shared_ptr<AccessibleAbilityManagerService> aams = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
 
-    // add an ability connection client
+    // Add an ability connection client
     AppExecFwk::ExtensionAbilityInfo extensionInfo;
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo(extensionInfo);
     AppExecFwk::ElementName elementName("deviceId", "bundleName", "name");
@@ -308,7 +308,7 @@ HWTEST_F(KeyEventFilterUnitTest, KeyEventFilter_Unittest_ProcessEvent_001, TestS
     keyEventFilter_->OnKeyEvent(*event);
 
     GTEST_LOG_(INFO) << "Process event";
-    sleep(3); // wait for ProcessEvent
+    sleep(3); // Wait for ProcessEvent
 
     GTEST_LOG_(INFO) << "KeyEventFilter_Unittest_ProcessEvent_001 end";
 }

services/aams/test/unittest/accessibility_window_manager_test.cpp

@@ -59,13 +59,12 @@ void AccessibilityWindowManagerTest::TearDownTestCase()
 void AccessibilityWindowManagerTest::SetUp()
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManagerTest SetUp";
-    /* register bundleService */
+    // Register bundleService
     mock_ = new OHOS::AppExecFwk::BundleMgrService();
     sptr<ISystemAbilityManager> systemAbilityManager =
         SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
     OHOS::ISystemAbilityManager::SAExtraProp saExtraProp;
     systemAbilityManager->AddSystemAbility(OHOS::BUNDLE_MGR_SERVICE_SYS_ABILITY_ID, mock_, saExtraProp);
-    /* aams OnStart */
     ins_ = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
     ins_->OnStart();
 }
@@ -245,7 +244,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW
     sptr<AccessibilityElementOperatorStub> stub = new AccessibilityElementOperatorStub();
     sptr<IAccessibilityElementOperator> proxy =
         new AccessibilityElementOperatorProxy(stub);
-    /* add asacConnections */
+    // Add asacConnections
     sptr<AccessibilityAccountData> accountData = ins_->GetCurrentAccountData();
     ins_->RegisterElementOperator(1, proxy, 0);
     auto map = accountData->GetAsacConnections();
@@ -267,7 +266,6 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW
         GTEST_LOG_(INFO) << "a11yWindows_ is empty";
         windowInfoManager.a11yWindows_.clear();
     }
-    /* OnWindowChange */
     EXPECT_TRUE(!windowInfoManager.a11yWindows_.size());
 
     AccessibilityWindowInfo info = windowInfoManager.CreateAccessibilityWindowInfo(*winInfo);
@@ -311,7 +309,6 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW
         EXPECT_EQ(2, it->second.GetWindowType());
     }
 
-    /* id == wid */
     winInfo->wid_ = 2;
     mgr.windowListener_->OnWindowUpdate(winInfo, Rosen::WindowUpdateType::WINDOW_UPDATE_REMOVED);
 
@@ -350,7 +347,6 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW
         EXPECT_EQ(2, it->second.GetWindowType());
     }
 
-    /* id != wid != INVALID_WINDOW_ID */
     winInfo->wid_ = 1;
     mgr.windowListener_->OnWindowUpdate(winInfo,
                        Rosen::WindowUpdateType::WINDOW_UPDATE_REMOVED);
@@ -391,7 +387,6 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW
         EXPECT_EQ(2, it->second.GetWindowType());
     }
 
-    /* id == wid == INVALID_WINDOW_ID */
     winInfo->wid_ = -1;
     mgr.windowListener_->OnWindowUpdate(winInfo,
                        Rosen::WindowUpdateType::WINDOW_UPDATE_REMOVED);
@@ -408,17 +403,17 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_SetActiveWindow001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetActiveWindow001 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info;
     mgr.activeWindowId_ = ACTIVE_WINDOW_ID;
     EXPECT_EQ(0, (int)mgr.a11yWindows_.size());
     mgr.a11yWindows_.insert(std::make_pair(ANY_WINDOW_ID, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
-    /* SetActiveWindow */
+    // SetActiveWindow
     int windowId = INVALID_WINDOW_ID;
     mgr.SetActiveWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(ACTIVE_WINDOW_ID)) {
         test1 = true;
@@ -438,17 +433,17 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_SetActiveWindow002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetActiveWindow002 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info;
     mgr.activeWindowId_ = ACTIVE_WINDOW_ID;
     EXPECT_EQ(0, (int)mgr.a11yWindows_.size());
     mgr.a11yWindows_.insert(std::make_pair(ACTIVE_WINDOW_ID, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
-    /* SetActiveWindow */
+    // SetActiveWindow
     int windowId = INVALID_WINDOW_ID;
     mgr.SetActiveWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(ACTIVE_WINDOW_ID)) {
         test1 = true;
@@ -470,17 +465,17 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_SetActiveWindow003, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetActiveWindow003 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info;
     mgr.activeWindowId_ = ACTIVE_WINDOW_ID;
     EXPECT_EQ(0, (int)mgr.a11yWindows_.size());
     mgr.a11yWindows_.insert(std::make_pair(ANY_WINDOW_ID, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
-    /* SetActiveWindow */
+    // SetActiveWindow
     int windowId = ACTIVE_WINDOW_ID;
     mgr.SetActiveWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(windowId)) {
         test1 = true;
@@ -500,7 +495,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_SetActiveWindow004, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetActiveWindow004 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info1;
     AccessibilityWindowInfo info2;
@@ -510,9 +505,9 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
     mgr.a11yWindows_.insert(std::make_pair(ACTIVE_WINDOW_ID, info1));
     mgr.a11yWindows_.insert(std::make_pair(windowId, info2));
     EXPECT_EQ(2, (int)mgr.a11yWindows_.size());
-    /* SetActiveWindow */
+    // SetActiveWindow
     mgr.SetActiveWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(ACTIVE_WINDOW_ID)) {
         test1 = true;
@@ -537,17 +532,17 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
     TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetAccessibilityFocusedWindow001 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info;
     mgr.a11yFocusedWindowId_ = ANY_WINDOW_ID;
     EXPECT_EQ(0, (int)mgr.a11yWindows_.size());
     mgr.a11yWindows_.insert(std::make_pair(ACTIVE_WINDOW_ID, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
-    /* SetAccessibilityFocusedWindow */
+    // SetAccessibilityFocusedWindow
     int windowId = INVALID_WINDOW_ID;
     mgr.SetAccessibilityFocusedWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(ANY_WINDOW_ID)) {
         test1 = true;
@@ -568,17 +563,17 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
     TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetAccessibilityFocusedWindow002 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info;
     mgr.a11yFocusedWindowId_ = ANY_WINDOW_ID;
     EXPECT_EQ(0, (int)mgr.a11yWindows_.size());
     mgr.a11yWindows_.insert(std::make_pair(ANY_WINDOW_ID, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
-    /* SetAccessibilityFocusedWindow */
+    // SetAccessibilityFocusedWindow
     int windowId = INVALID_WINDOW_ID;
     mgr.SetAccessibilityFocusedWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(ANY_WINDOW_ID)) {
         test1 = true;
@@ -601,17 +596,17 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
     TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetAccessibilityFocusedWindow003 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info;
     mgr.a11yFocusedWindowId_ = ACTIVE_WINDOW_ID;
     EXPECT_EQ(0, (int)mgr.a11yWindows_.size());
     mgr.a11yWindows_.insert(std::make_pair(ANY_WINDOW_ID, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
-    /* SetAccessibilityFocusedWindow */
+    // SetAccessibilityFocusedWindow
     int windowId = ACTIVE_WINDOW_ID;
     mgr.SetAccessibilityFocusedWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(windowId)) {
         test1 = true;
@@ -632,7 +627,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
     TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetAccessibilityFocusedWindow004 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info1;
     AccessibilityWindowInfo info2;
@@ -642,9 +637,9 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
     mgr.a11yWindows_.insert(std::make_pair(ANY_WINDOW_ID, info1));
     mgr.a11yWindows_.insert(std::make_pair(windowId, info2));
     EXPECT_EQ(2, (int)mgr.a11yWindows_.size());
-    /* SetAccessibilityFocusedWindow */
+    // SetAccessibilityFocusedWindow
     mgr.SetAccessibilityFocusedWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(ANY_WINDOW_ID)) {
         test1 = true;
@@ -668,17 +663,17 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_SetInputFocusedWindow001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetInputFocusedWindow001 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info;
     mgr.inputFocusedWindowId_ = ACTIVE_WINDOW_ID;
     EXPECT_EQ(0, (int)mgr.a11yWindows_.size());
     mgr.a11yWindows_.insert(std::make_pair(ANY_WINDOW_ID, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
-    /* SetInputFocusedWindow */
+    // SetInputFocusedWindow
     int windowId = INVALID_WINDOW_ID;
     mgr.SetInputFocusedWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(ACTIVE_WINDOW_ID)) {
         test1 = true;
@@ -698,17 +693,17 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_SetInputFocusedWindow002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetInputFocusedWindow002 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info;
     mgr.inputFocusedWindowId_ = ACTIVE_WINDOW_ID;
     EXPECT_EQ(0, (int)mgr.a11yWindows_.size());
     mgr.a11yWindows_.insert(std::make_pair(ACTIVE_WINDOW_ID, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
-    /* SetInputFocusedWindow */
+    // SetInputFocusedWindow
     int windowId = INVALID_WINDOW_ID;
     mgr.SetInputFocusedWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(ACTIVE_WINDOW_ID)) {
         test1 = true;
@@ -731,17 +726,17 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
     TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetInputFocusedWindow003 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info;
     mgr.inputFocusedWindowId_ = ACTIVE_WINDOW_ID;
     EXPECT_EQ(0, (int)mgr.a11yWindows_.size());
     mgr.a11yWindows_.insert(std::make_pair(ANY_WINDOW_ID, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
-    /* SetInputFocusedWindow */
+    // SetInputFocusedWindow
     int windowId = ACTIVE_WINDOW_ID;
     mgr.SetInputFocusedWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(windowId)) {
         test1 = true;
@@ -761,7 +756,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_SetInputFocusedWindow004, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetInputFocusedWindow004 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     AccessibilityWindowInfo info1;
     AccessibilityWindowInfo info2;
@@ -771,9 +766,9 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
     mgr.a11yWindows_.insert(std::make_pair(ACTIVE_WINDOW_ID, info1));
     mgr.a11yWindows_.insert(std::make_pair(windowId, info2));
     EXPECT_EQ(2, (int)mgr.a11yWindows_.size());
-    /* SetInputFocusedWindow */
+    // SetInputFocusedWindow
     mgr.SetInputFocusedWindow(windowId);
-    /* test */
+    // Test
     bool test1 = false;
     if (mgr.a11yWindows_.count(ACTIVE_WINDOW_ID)) {
         test1 = true;
@@ -798,7 +793,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Get
     TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_GetAccessibilityWindows001 start";
-    /* map insert value */
+    // Insert value
     int windowId = ANY_WINDOW_ID;
     Rosen::WindowInfo winInfo;
     winInfo.type_ = Rosen::WindowType::BELOW_APP_SYSTEM_WINDOW_BASE;
@@ -815,10 +810,10 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Get
     mgr.a11yWindows_.insert(std::make_pair(windowId, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
 
-    /* SetAccessibilityFocusedWindow */
+    // SetAccessibilityFocusedWindow
     mgr.SetAccessibilityFocusedWindow(windowId);
 
-    /* GetAccessibilityWindows */
+    // GetAccessibilityWindows
     std::vector<AccessibilityWindowInfo> windows = mgr.GetAccessibilityWindows();
     EXPECT_EQ(1, (int)windows.size());
     static Accessibility::WindowType type = windows.begin()->GetWindowType();
@@ -837,7 +832,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Get
     TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_GetAccessibilityWindow001 start";
-    /* map insert value */
+    // Insert value
     int windowId = ANY_WINDOW_ID;
     Rosen::WindowInfo winInfo;
     winInfo.type_ = Rosen::WindowType::BELOW_APP_SYSTEM_WINDOW_BASE;
@@ -854,7 +849,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Get
     mgr.a11yWindows_.insert(std::make_pair(windowId, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
 
-    /* GetAccessibilityWindow */
+    // GetAccessibilityWindow
     bool window = mgr.GetAccessibilityWindow(windowId, info);
     EXPECT_TRUE(window);
 
@@ -871,7 +866,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Get
     TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_GetAccessibilityWindow002 start";
-    /* map insert value */
+    // Insert value
     int windowId = ANY_WINDOW_ID;
     OHOS::Rosen::WindowInfo winInfo;
     winInfo.type_ = Rosen::WindowType::BELOW_APP_SYSTEM_WINDOW_BASE;
@@ -888,7 +883,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Get
     mgr.a11yWindows_.insert(std::make_pair(windowId, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
 
-    /* GetAccessibilityWindow */
+    // GetAccessibilityWindow
     bool window = mgr.GetAccessibilityWindow(-1, info);
     EXPECT_FALSE(window);
 
@@ -904,7 +899,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Get
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_IsValidWindow001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_IsValidWindow001 start";
-    /* map insert value */
+    // Insert value
     int windowId = ANY_WINDOW_ID;
     OHOS::Rosen::WindowInfo winInfo;
     winInfo.type_ = Rosen::WindowType::BELOW_APP_SYSTEM_WINDOW_BASE;
@@ -921,7 +916,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_IsV
     mgr.a11yWindows_.insert(std::make_pair(windowId, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
 
-    /* IsValidWindow */
+    // IsValidWindow
     bool window = mgr.IsValidWindow(windowId);
     EXPECT_TRUE(window);
 
@@ -937,7 +932,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_IsV
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_IsValidWindow002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_IsValidWindow002 start";
-    /* map insert value */
+    // Insert value
     int windowId = ANY_WINDOW_ID;
     OHOS::Rosen::WindowInfo winInfo;
     winInfo.type_ = Rosen::WindowType::BELOW_APP_SYSTEM_WINDOW_BASE;
@@ -954,7 +949,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_IsV
     mgr.a11yWindows_.insert(std::make_pair(windowId, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
 
-    /* IsValidWindow */
+    // IsValidWindow
     bool window = mgr.IsValidWindow(0);
     EXPECT_FALSE(window);
 
@@ -970,7 +965,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_IsV
 HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_SetWindowSize001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibilityWindowManager_Unittest_SetWindowSize001 start";
-    /* map insert value */
+    // Insert value
     AccessibilityWindowInfoManager& mgr = AccessibilityWindowInfoManager::GetInstance();
     int windowId = ANY_WINDOW_ID;
     AccessibilityWindowInfo info;
@@ -978,7 +973,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_Set
     mgr.a11yWindows_.insert(std::make_pair(windowId, info));
     EXPECT_EQ(1, (int)mgr.a11yWindows_.size());
 
-    /* SetWindowSize */
+    // SetWindowSize
     Rect rect(1, 2, 3, 4);
     mgr.SetWindowSize(windowId, rect);
     AccessibilityWindowInfo mapInfo;

services/aams/test/unittest/accessible_ability_connection_test.cpp

@@ -76,15 +76,13 @@ void AccessibleAbilityConnectionUnitTest::SetUp()
 
     DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->OnStart();
 
-    // new Interaction proxy
     sptr<AccessibilityElementOperatorStub> stub = new AccessibilityElementOperatorStub();
     sptr<IAccessibilityElementOperator> proxy =
         new AccessibilityElementOperatorProxy(stub);
     sptr<AccessibilityWindowConnection> connection = new AccessibilityWindowConnection(0, proxy, 0);
-    // aams RegisterElementOperator
+    // RegisterElementOperator
     DelayedSingleton<AccessibleAbilityManagerService>::GetInstance()->
         RegisterElementOperator(0, proxy, 0);
-    // new AAconnection
     AppExecFwk::ExtensionAbilityInfo info;
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo(info);
     accountData_ = new AccessibilityAccountData(0);
@@ -181,7 +179,7 @@ HWTEST_F(AccessibleAbilityConnectionUnitTest,
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityConnection_Unittest_OnAccessibilityEvent_001 start";
     AccessibilityEventInfo eventInfo;
-    /* EventType is in the allowed list */
+    // EventType is in the allowed list
     eventInfo.SetEventType(EventType::TYPE_PAGE_STATE_UPDATE);
     connection_->OnAccessibilityEvent(eventInfo);
     EXPECT_EQ(int(EventType::TYPE_PAGE_STATE_UPDATE), g_testEventType);
@@ -199,9 +197,9 @@ HWTEST_F(AccessibleAbilityConnectionUnitTest,
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityConnection_Unittest_OnAccessibilityEvent_002 start";
     AccessibilityEventInfo eventInfo;
-    /* EventType is in the allowed list */
+    // EventType is in the allowed list
     eventInfo.SetEventType(EventType::TYPE_VIEW_CLICKED_EVENT);
-    /* invalid window */
+    // Invalid window
     eventInfo.SetWindowId(3);
     connection_->OnAccessibilityEvent(eventInfo);
     EXPECT_EQ(-1, g_testEventType);

services/aams/test/unittest/accessible_ability_manager_service_test.cpp

@@ -63,7 +63,7 @@ void AccessibleAbilityManagerServiceUnitTest::TearDownTestCase()
 void AccessibleAbilityManagerServiceUnitTest::SetUp()
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityManagerServiceUnitTest SetUp";
-    // register bundleservice
+    // Register bundleservice
     mock_ = new OHOS::AppExecFwk::BundleMgrService();
     sptr<ISystemAbilityManager> systemAbilityManager =
         SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
@@ -87,7 +87,7 @@ void AccessibleAbilityManagerServiceUnitTest::TearDown()
 
 void AccessibleAbilityManagerServiceUnitTest::RegisterAbilityConnectionClient(const sptr<IRemoteObject>& obj)
 {
-    // add an ability connection client
+    // Add an ability connection client
     AppExecFwk::ExtensionAbilityInfo extensionInfo;
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo(extensionInfo);
     AppExecFwk::ElementName elementName("deviceId", "bundleName", "name");
@@ -243,7 +243,7 @@ HWTEST_F(AccessibleAbilityManagerServiceUnitTest, RemovedUser_001, TestSize.Leve
     RegisterAbilityConnectionClient(stub_);
     EXPECT_EQ(int(ins_->GetCurrentAccountData()->GetConnectedA11yAbilities().size()), 1);
     ins_->RemovedUser(1);
-    // can't to check a11yAccountsData_ because it is private,and don't provite api.
+    // Can't to check a11yAccountsData_ because it is private,and don't provite api.
     GTEST_LOG_(INFO) << "Accessible_Ability_Manager_ServiceUnittest_RemovedUser_001 end";
 }
 
@@ -287,7 +287,7 @@ HWTEST_F(AccessibleAbilityManagerServiceUnitTest, PackageChanged_001, TestSize.L
     GTEST_LOG_(INFO) << "Accessible_Ability_Manager_ServiceUnittest_PackageChanged_001 start";
     sptr<AccessibilityAccountData> accountData = ins_->GetCurrentAccountData();
     accountData->ClearInstalledAbility();
-    /* install ability is null */
+    // Install ability is null
     GTEST_LOG_(INFO) << "GetInstalledAbilities start";
     EXPECT_EQ(0, int(accountData->GetInstalledAbilities().size()));
     GTEST_LOG_(INFO) << "PackageChanged start";
@@ -296,7 +296,7 @@ HWTEST_F(AccessibleAbilityManagerServiceUnitTest, PackageChanged_001, TestSize.L
     GTEST_LOG_(INFO) << "PackageChanged end";
     EXPECT_EQ(0, int(accountData->GetInstalledAbilities().size()));
     GTEST_LOG_(INFO) << "GetInstalledAbilities end";
-    /* add install ability */
+    // Add install ability
     RegisterAbilityConnectionClient(stub_);
     EXPECT_EQ(1, int(accountData->GetInstalledAbilities().size()));
     bundleName = "bundleName2";

services/test/mock/accessibility_ability_info_mock.cpp

@@ -56,9 +56,7 @@ void AccessibilityAbilityInfo::SetPackageName(string bundleName)
 
 AccessibilityAbilityInfo::AccessibilityAbilityInfo(const ExtensionAbilityInfo &abilityInfo)
 {
-    // CAPABILITY_KEY_EVENT_OBSERVER | CAPABILITY_TOUCH_GUIDE |
-    // CAPABILITY_ZOOM | CAPABILITY_RETRIEVE | CAPABILITY_GESTURE
-    uint32_t capabilities = 0x0008 | 0x0002 | 0x0001 | 0x0020;
+    uint32_t capabilities = CAPABILITY_KEY_EVENT_OBSERVER | CAPABILITY_TOUCH_GUIDE | CAPABILITY_RETRIEVE;
     capabilities_ = capabilities;
 }
 

services/test/mock/accessibility_window_info_mock.cpp

@@ -19,7 +19,6 @@
 
 namespace OHOS {
 namespace Accessibility {
-/* AccessibleAction     Parcel struct                   */
 bool AccessibilityWindowInfo::ReadFromParcel(Parcel &parcel)
 {
     int windowType;

services/test/mock/accessible_ability_manager_service_mock.cpp

@@ -244,7 +244,7 @@ void AccessibleAbilityManagerService::UpdateAbilities()
         AppExecFwk::ElementName element(installAbility.GetAbilityInfo().deviceId,
                                         installAbility.GetPackageName(), installAbility.GetName());
         std::string elementName =  element.GetURI();
-        // wait for the connecting ability.
+        // Wait for the connecting ability.
         if (accountData->GetConnectingA11yAbilities().count(elementName)) {
             continue;
         }

services/test/moduletest/aamstest/aams_accessibility_keyevent_filter_test/aams_accessibility_keyevent_filter_test.cpp

@@ -104,7 +104,7 @@ void AamsKeyEventFilterTest::SetUp()
 
     sptr<AccessibleAbilityClientStubImpl> stub = new AccessibleAbilityClientStubImpl();
 
-    // add an ability connection client
+    // Add an ability connection client
     AppExecFwk::ExtensionAbilityInfo extensionInfo;
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo(extensionInfo);
     AppExecFwk::ElementName elementName("deviceId", "bundleName", "name");

services/test/moduletest/aamstest/aams_accessibility_touchEvent_injector_test/aams_accessibility_touchEvent_injector_test.cpp

@@ -80,7 +80,7 @@ void AamsInjectorTest::SetUp()
 {
     GTEST_LOG_(INFO) << "AamsInjectorTest SetUp";
     CreateAccessibilityConfigForTouchGuide();
-    // register bundleservice
+    // Register bundleservice
     mock_ = new OHOS::AppExecFwk::BundleMgrService();
     sptr<ISystemAbilityManager> systemAbilityManager =
         SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
@@ -90,10 +90,9 @@ void AamsInjectorTest::SetUp()
     g_ins = DelayedSingleton<AccessibleAbilityManagerService>::GetInstance();
     g_ins->OnStart();
 
-    // accessibleAbility connection
     sptr<AccessibleAbilityClientStubImpl> accessibleAbility = new AccessibleAbilityClientStubImpl();
 
-    // add an ability connection client
+    // Add an ability connection client
     AppExecFwk::ExtensionAbilityInfo extensionInfo;
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo(extensionInfo);
     AppExecFwk::ElementName elementName("deviceId", "bundleName", "name");
@@ -188,7 +187,6 @@ void AamsInjectorTest::CreateAccessibilityConfigForTouchGuide()
 void AamsInjectorTest::AddAccessibilityWindowConnection()
 {
     GTEST_LOG_(INFO) << "AamsInjectorTest AddAccessibilityWindowConnection";
-    // accessibility interaction connection
     int windowId = 0;
     sptr<IAccessibilityElementOperator> operation = nullptr;
     int accountId = 0;

services/test/moduletest/aamstest/aams_accessibility_touchEvent_injector_test/mock/accessibility_window_info_mock.cpp

@@ -19,7 +19,6 @@
 
 namespace OHOS {
 namespace Accessibility {
-/* AccessibleAction     Parcel struct                   */
 bool AccessibilityWindowInfo::ReadFromParcel(Parcel &parcel)
 {
     int windowType;

services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp

@@ -129,7 +129,7 @@ void AamsTouchGuideTest::SetUp()
 {
     GTEST_LOG_(INFO) << "AamsTouchGuideTest SetUp";
     CreateAccessibilityConfigForTouchGuide();
-    // register bundleservice
+    // Register bundleservice
     mock_ = new OHOS::AppExecFwk::BundleMgrService();
     sptr<ISystemAbilityManager> systemAbilityManager =
         SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
@@ -141,7 +141,7 @@ void AamsTouchGuideTest::SetUp()
 
     stub_ = new AccessibleAbilityClientStubImpl();
 
-    // add an ability connection client
+    // Add an ability connection client
     AppExecFwk::ExtensionAbilityInfo extensionInfo;
     sptr<AccessibilityAbilityInfo> abilityInfo = new AccessibilityAbilityInfo(extensionInfo);
     AppExecFwk::ElementName elementName("deviceId", "bundleName", "name");
@@ -218,7 +218,6 @@ std::shared_ptr<MMI::PointerEvent> AamsTouchGuideTest::CreateTouchEvent(int acti
 void AamsTouchGuideTest::AddAccessibilityWindowConnection()
 {
     GTEST_LOG_(INFO) << "aamsAccessibleAbilityChannelTest AddAccessibilityWindowConnection";
-    // accessibility interaction connection
     int windowId = 0;
     sptr<IAccessibilityElementOperator> operation = nullptr;
     int accountId = 0;

services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/mock/accessibility_window_info_mock.cpp

@@ -19,7 +19,6 @@
 
 namespace OHOS {
 namespace Accessibility {
-/* AccessibleAction Parcel struct */
 bool AccessibilityWindowInfo::ReadFromParcel(Parcel &parcel)
 {
     int windowType;

services/test/moduletest/aamstest/aams_accessible_ability_channel_test/aams_accessible_ability_channel_test.cpp

@@ -86,7 +86,7 @@ void AamsAccessibleAbilityChannelTest::TearDownTestCase()
 void AamsAccessibleAbilityChannelTest::SetUp()
 {
     GTEST_LOG_(INFO) << "AamsAccessibleAbilityChannelTest SetUp";
-    // register bundleservice
+    // Register bundleservice
     mock_ = new OHOS::AppExecFwk::BundleMgrService();
     sptr<ISystemAbilityManager> systemAbilityManager =
         SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
@@ -103,7 +103,7 @@ void AamsAccessibleAbilityChannelTest::SetUp()
 void AamsAccessibleAbilityChannelTest::TearDown()
 {
     GTEST_LOG_(INFO) << "AamsAccessibleAbilityChannelTest TearDown";
-    // reset test value
+    // Reset test value
     g_testChannelElementId = -1;
     g_testChannelrequestId = -1;
     g_testChannelmode = -1;
@@ -115,7 +115,7 @@ void AamsAccessibleAbilityChannelTest::TearDown()
     g_testActionArguments.clear();
     // Deregister ElementOperator
     aams_->DeregisterElementOperator(0);
-    // stop AAMS
+    // Stop AAMS
     aams_->OnStop();
     mock_ = nullptr;
     aams_ = nullptr;
@@ -216,7 +216,6 @@ void AamsAccessibleAbilityChannelTest::CreateAccessibilityConfigNoCapability()
 void AamsAccessibleAbilityChannelTest::AddAccessibleAbilityConnection()
 {
     GTEST_LOG_(INFO) << "AamsAccessibleAbilityChannelTest AddAccessibleAbilityConnection";
-    // accessibleAbility connection
     AppExecFwk::ExtensionAbilityInfo info;
     AAFwk::Want want;
     AppExecFwk::ElementName name;
@@ -237,7 +236,6 @@ void AamsAccessibleAbilityChannelTest::AddAccessibleAbilityConnection()
 void AamsAccessibleAbilityChannelTest::AddAccessibilityWindowConnection()
 {
     GTEST_LOG_(INFO) << "AamsAccessibleAbilityChannelTest AddAccessibilityWindowConnection";
-    // accessibility interaction connection
     int windowId = 0;
     sptr<IAccessibilityElementOperator> operation = nullptr;
     int accountId = 0;
@@ -251,7 +249,7 @@ void AamsAccessibleAbilityChannelTest::CreateGesturePath(
     GesturePathPositionDefine startpoint, GesturePathPositionDefine endpoint, int64_t durationTime)
 {
     GTEST_LOG_(INFO) << "AamsAccessibleAbilityChannelTest CreateGesturePath";
-    // create gesture
+    // Create gesture
     GesturePathDefine gesturePathDefine = GesturePathDefine(startpoint, endpoint, durationTime);
     gesturePathDefine.SetStartPosition(startpoint);
     gesturePathDefine.SetEndPosition(endpoint);
@@ -269,9 +267,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_SearchElementInfoByAccessibilityId_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_SearchElementInfoByAccessibilityId_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -298,9 +296,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_SearchElementInfoByAccessibilityId_002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_SearchElementInfoByAccessibilityId_002 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -326,9 +324,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_SearchElementInfosByText_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_SearchElementInfosByText_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -355,9 +353,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_SearchElementInfosByText_002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_SearchElementInfosByText_002 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -384,9 +382,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_FindFocusedElementInfo_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_FindFocusedElementInfo_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -413,9 +411,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_FindFocusedElementInfo_002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_FindFocusedElementInfo_002 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -442,9 +440,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_FindFocusedElementInfo_003, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_FindFocusedElementInfo_003 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -470,9 +468,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
 HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_FocusMoveSearch_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_FocusMoveSearch_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -498,9 +496,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_F
 HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_FocusMoveSearch_002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_FocusMoveSearch_002 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -526,9 +524,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_F
 HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_ExecuteAction_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_ExecuteAction_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -557,9 +555,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_E
 HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_ExecuteAction_002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_ExecuteAction_002 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -587,9 +585,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_E
 HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_GetWindows_002, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_GetWindows_002 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // not add interaction connection,add accessibleAbility connection
+    // Not add interaction connection,add accessibleAbility connection
     AddAccessibleAbilityConnection();
 
     ASSERT_TRUE(g_testStub);
@@ -610,9 +608,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_G
 HWTEST_F(AamsAccessibleAbilityChannelTest, AccessibleAbilityChannel_ModuleTest_SendSimulateGesture_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_SendSimulateGesture_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigForTouchGuide();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -642,9 +640,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_SearchElementInfoByAccessibilityId_NoCapability_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_SearchElementInfoByAccessibilityId_NoCapability_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigNoCapability();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -670,9 +668,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_SearchElementInfosByText_NoCapability_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_SearchElementInfosByText_NoCapability_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigNoCapability();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -699,9 +697,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_FindFocusedElementInfo_NoCapability_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_FindFocusedElementInfo_NoCapability_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigNoCapability();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -728,9 +726,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_FocusMoveSearch_NoCapability_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_FocusMoveSearch_NoCapability_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigNoCapability();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -757,9 +755,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_ExecuteAction_NoCapability_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_ExecuteAction_NoCapability_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigNoCapability();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -789,9 +787,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_GetWindows_NoCapability_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_GetWindows_NoCapability_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigNoCapability();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 
@@ -814,9 +812,9 @@ HWTEST_F(AamsAccessibleAbilityChannelTest,
     AccessibleAbilityChannel_ModuleTest_SendSimulateGesture_NoCapability_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AccessibleAbilityChannel_ModuleTest_SendSimulateGesture_NoCapability_001 start";
-    // create json
+    // Create json
     CreateAccessibilityConfigNoCapability();
-    // add connection
+    // Add connection
     AddAccessibilityWindowConnection();
     AddAccessibleAbilityConnection();
 

services/test/moduletest/aamstest/aams_common_event_registry_test/aams_common_event_registry_test.cpp

@@ -61,7 +61,7 @@ void AccessibilityCommonEventRegistryTest::TearDownTestCase()
 void AccessibilityCommonEventRegistryTest::SetUp()
 {
     GTEST_LOG_(INFO) << "SetUp";
-    // register bundleservice
+    // Register bundleservice
     mock_ = new OHOS::AppExecFwk::BundleMgrService();
     sptr<ISystemAbilityManager> systemAbilityManager =
         SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
@@ -117,7 +117,7 @@ HWTEST_F(AccessibilityCommonEventRegistryTest, AccessibilityCommonEventRegistry_
     AddAccessibleAbilityConnection();
     accountData_->AddConnectingA11yAbility(*elementName_);
     EXPECT_EQ(1, int(accountData_->GetConnectingA11yAbilities().size()));
-    /* PackageUpdateFinished */
+    // PackageUpdateFinished
     std::string str = "bundleName";
     aams_->PackageUpdateFinished(str);
     EXPECT_EQ(0, int(accountData_->GetConnectingA11yAbilities().size()));
@@ -139,7 +139,7 @@ HWTEST_F(AccessibilityCommonEventRegistryTest, AccessibilityCommonEventRegistry_
     GTEST_LOG_(INFO) << "AccessibilityCommonEventRegistry_ModuleTest_PackageChanged_001 start";
     AddAccessibleAbilityConnection();
     EXPECT_EQ(1, int(accountData_->GetInstalledAbilities().size()));
-    /* PackageChanged */
+    // PackageChanged 
     std::string bundleName = "bundleName";
     aams_->PackageChanged(bundleName);
     EXPECT_EQ(1, int(accountData_->GetInstalledAbilities().size()));

services/test/moduletest/aamstest/aams_server_test/aams_server_test.cpp

@@ -77,7 +77,7 @@ void AAMSServerTest::TearDownTestCase()
 void AAMSServerTest::SetUp()
 {
     GTEST_LOG_(INFO) << "AAMSServerTest SetUp";
-    // register bundleservice
+    // Register bundleservice
     mock_ = new OHOS::AppExecFwk::BundleMgrService();
     sptr<ISystemAbilityManager> systemAbilityManager =
         SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
@@ -162,7 +162,6 @@ void AAMSServerTest::CreateAccessibilityConfigForTouchGuide()
 void AAMSServerTest::AddAccessibleAbilityConnection()
 {
     GTEST_LOG_(INFO) << "AAMSServerTest AddAccessibleAbilityConnection";
-    // accessibleAbility connection
     AppExecFwk::ExtensionAbilityInfo info;
     AAFwk::Want want;
     AppExecFwk::ElementName name;
@@ -189,15 +188,15 @@ void AAMSServerTest::AddAccessibleAbilityConnection()
 HWTEST_F(AAMSServerTest, SendEvent_001, TestSize.Level1)
 {
     GTEST_LOG_(INFO) << "AAMSServerTest SendEvent_001 start";
-    // register AA
+    // Register AA
     AddAccessibleAbilityConnection();
-    // make an event
+    // Make an event
     AccessibilityEventInfo eventInfo;
     eventInfo.SetEventType(EventType::TYPE_WINDOW_UPDATE);
-    // aams send event
+    // Send event
     aams_->SendEvent(eventInfo, 100);
     sleep(1);
-    // check aa proxy
+    // Check aa proxy
     EXPECT_EQ(g_testEventType, int(EventType::TYPE_WINDOW_UPDATE));
 
     AAConnection_->OnAbilityDisconnectDone(*elementName_, 0);
@@ -258,12 +257,12 @@ HWTEST_F(AAMSServerTest, GetAbilityList_003, TestSize.Level1)
     installAbilityInfo->SetPackageName("123");
     auto accountData = aams_->GetCurrentAccountData();
 
-    /* add install ability dummy */
+    // Add install ability dummy
     EXPECT_EQ(1, (int)accountData->GetInstalledAbilities().size());
     accountData->AddInstalledAbility(*installAbilityInfo);
     EXPECT_EQ(2, (int)accountData->GetInstalledAbilities().size());
 
-    /* ABILITY_STATE_DISABLE */
+    // ABILITY_STATE_DISABLE
     int32_t stateType = AbilityStateType::ABILITY_STATE_DISABLE;
     auto ret = aams_->GetAbilityList(AccessibilityAbilityTypes::ACCESSIBILITY_ABILITY_TYPE_SPOKEN, stateType);
     EXPECT_EQ(int(ret.size()), 1);
@@ -358,12 +357,12 @@ HWTEST_F(AAMSServerTest, DeregisterElementOperator_001, TestSize.Level1)
     map = accountData->GetAsacConnections();
     EXPECT_EQ(int(map.size()), 1);
 
-    // wrong windowId
+    // Wrong windowId
     aams_->DeregisterElementOperator(1);
     map = accountData->GetAsacConnections();
     EXPECT_EQ(int(map.size()), 1);
 
-    // true windowId
+    // True windowId
     aams_->DeregisterElementOperator(0);
     sleep(1);
     map = accountData->GetAsacConnections();

test/resource/native_application/aamsSystemTestB/include/amsstabilityb1.h

@@ -29,7 +29,6 @@ class AccessibleAbilityListenerTest;
 
 class AamsStAbilityB1 : public Ability {
 public:
-    // aams
     void Interrupt();
     void RegisterInteractionOperation();
     void DeregisterInteractionOperation();
@@ -38,12 +37,9 @@ public:
     void GetAccessibilityCaptionProperties();
     void SendEventWithType();
     void SendEvent();
-    // state callback
     void SubscribeStateObserver();
     void UnsubscribeStateObserver();
     void UnsubscribeStateObserverEventType();
-
-    // AA->AAMS
     void RegisterListenerToAA();
     void ConnectToAAMS();
     void GetRootElementInfo();

test/resource/native_application/tools/include/stoperator.h

@@ -53,9 +53,8 @@ private:
     string g_abilityType;
     string g_bundleName;
     string g_abilityName;
-    string g_operatorName;  // data ability
+    string g_operatorName; // data ability
     string g_message;
-    /* data */
     static int countChild;
 };
 } // namespace STtools

util/include/accessibility_errorcode.h

@@ -17,7 +17,6 @@
 
 namespace OHOS {
 namespace Accessibility {
-/* Accessibility errcode defines */
 enum ErrCode {
     NO_ERROR = 0,
     ERR_INVALID_STATE,