diff --git a/frameworks/cj/src/input_method_ffi.cpp b/frameworks/cj/src/input_method_ffi.cpp index 9016c2878cb1e9217e625a616d3b4a87dd660f9f..64cfb1a8bed4bd4f65abf7dfd2eb73e35d8faf1f 100644 --- a/frameworks/cj/src/input_method_ffi.cpp +++ b/frameworks/cj/src/input_method_ffi.cpp @@ -126,7 +126,7 @@ int32_t FfiInputMethodGetSystemInputMethodConfigAbility(CElementName *elem) } int32_t ret = ctrl->GetInputMethodConfig(inputMethodConfig); if (ret == ErrorCode::NO_ERROR) { - elem->deviceId = Utils::MallocCString(inputMethodConfig.GetDeviceID()); + elem->deviceId = Utils::MallocCString(inputMethodConfig.GetDeviceID()); // elem TODO elem->bundleName = Utils::MallocCString(inputMethodConfig.GetBundleName()); elem->abilityName = Utils::MallocCString(inputMethodConfig.GetAbilityName()); elem->moduleName = Utils::MallocCString(inputMethodConfig.GetModuleName()); diff --git a/frameworks/js/napi/common/js_callback_handler.cpp b/frameworks/js/napi/common/js_callback_handler.cpp index 94b81e861d2c852c48a5935bdbda067ae5769ffe..6c263dacb18f7b115072003246499bee5cbd5cd5 100644 --- a/frameworks/js/napi/common/js_callback_handler.cpp +++ b/frameworks/js/napi/common/js_callback_handler.cpp @@ -23,7 +23,7 @@ constexpr size_t MAX_ARGV_COUNT = 10; void JsCallbackHandler::Execute(const std::shared_ptr &object, const ArgContainer &argContainer, napi_value &output) { - if (object->threadId_ != std::this_thread::get_id()) { + if (object->threadId_ != std::this_thread::get_id()) { // object TODO IMSA_HILOGW("threadId not same!"); return; } diff --git a/frameworks/js/napi/common/js_callback_handler.h b/frameworks/js/napi/common/js_callback_handler.h index 95a245a8ec332b9bb5f406c38cf888521c14763e..8bd758ed02b704b1768e4c1e83f520d12156a704 100644 --- a/frameworks/js/napi/common/js_callback_handler.h +++ b/frameworks/js/napi/common/js_callback_handler.h @@ -51,7 +51,7 @@ public: { InputMethodSyncTrace tracer("Traverse callback with output"); for (const auto &object : objects) { - JsUtil::ScopeGuard scopeGuard(object->env_); + JsUtil::ScopeGuard scopeGuard(object->env_); // object TODO napi_value jsOutput = nullptr; Execute(object, argContainer, jsOutput); if (jsOutput != nullptr && JsUtil::GetValue(object->env_, jsOutput, output)) { diff --git a/frameworks/js/napi/inputmethodclient/async_call.cpp b/frameworks/js/napi/inputmethodclient/async_call.cpp index 9cb216c17e19e1239f25f795baf975f32eea512a..f6840bf884bce9586388f085ce821ace24afcea2 100644 --- a/frameworks/js/napi/inputmethodclient/async_call.cpp +++ b/frameworks/js/napi/inputmethodclient/async_call.cpp @@ -47,7 +47,7 @@ AsyncCall::AsyncCall(napi_env env, napi_callback_info info, std::shared_ptrctx = std::move(context); napi_create_reference(env, self, 1, &context_->self); } @@ -204,7 +204,7 @@ void AsyncCall::OnComplete(napi_env env, napi_status status, void *data) void AsyncCall::DeleteContext(napi_env env, AsyncContext *context) { if (env != nullptr) { - napi_delete_reference(env, context->callback); + napi_delete_reference(env, context->callback); // context TODO napi_delete_reference(env, context->self); napi_delete_async_work(env, context->work); } diff --git a/frameworks/js/napi/inputmethodclient/js_get_input_method_textchange_listener.cpp b/frameworks/js/napi/inputmethodclient/js_get_input_method_textchange_listener.cpp index b55beb6d77a49c366f33036910a8461872be6f96..65d604a4b73aad700b15b583af9c8e5c4a63dcdc 100644 --- a/frameworks/js/napi/inputmethodclient/js_get_input_method_textchange_listener.cpp +++ b/frameworks/js/napi/inputmethodclient/js_get_input_method_textchange_listener.cpp @@ -39,7 +39,7 @@ sptr JsGetInputMethodTextChangedListener::G void JsGetInputMethodTextChangedListener::InsertText(const std::u16string &text) { - JsGetInputMethodController::GetInstance()->InsertText(text); + JsGetInputMethodController::GetInstance()->InsertText(text); // 文件内統一排查GetInstance TODO } void JsGetInputMethodTextChangedListener::DeleteForward(int32_t length) diff --git a/frameworks/js/napi/inputmethodclient/js_input_method.cpp b/frameworks/js/napi/inputmethodclient/js_input_method.cpp index 50ba1a67081eacbb4b00f279b46230ea17a73443..f229fdd104e83989a39bf7733bc9e2b9e8c5e337 100644 --- a/frameworks/js/napi/inputmethodclient/js_input_method.cpp +++ b/frameworks/js/napi/inputmethodclient/js_input_method.cpp @@ -56,7 +56,7 @@ napi_status JsInputMethod::GetInputMethodProperty(napi_env env, napi_value argv, } napi_value result = nullptr; napi_get_named_property(env, argv, "name", &result); - status = JsUtils::GetValue(env, result, ctxt->packageName); + status = JsUtils::GetValue(env, result, ctxt->packageName); // ctxt TODO CHECK_RETURN(status == napi_ok, "get name failed!", status); result = nullptr; napi_get_named_property(env, argv, "id", &result); @@ -89,7 +89,7 @@ napi_status JsInputMethod::GetInputMethodSubProperty(napi_env env, napi_value ar napi_value result = nullptr; status = napi_get_named_property(env, argv, "name", &result); PARAM_CHECK_RETURN(env, status == napi_ok, " name ", TYPE_STRING, status); - status = JsUtils::GetValue(env, result, ctxt->name); + status = JsUtils::GetValue(env, result, ctxt->name); // ctxt TODO CHECK_RETURN(status == napi_ok, "get name failed!", status); result = nullptr; status = napi_get_named_property(env, argv, "id", &result); diff --git a/frameworks/js/napi/keyboardpanelmanager/js_keyboard_panel_manager.cpp b/frameworks/js/napi/keyboardpanelmanager/js_keyboard_panel_manager.cpp index 1cb5c03bacf41a089aae2d4d544e1f001b674a60..22234c3610c69e554bd486d253408f5c9520f0ed 100644 --- a/frameworks/js/napi/keyboardpanelmanager/js_keyboard_panel_manager.cpp +++ b/frameworks/js/napi/keyboardpanelmanager/js_keyboard_panel_manager.cpp @@ -77,7 +77,7 @@ napi_value JsKeyboardPanelManager::ConnectSystemCmd(napi_env env, napi_callback_ auto ctxt = std::make_shared(); auto manager = JsKeyboardPanelManager::GetInstance(); auto exec = [ctxt, env, manager](AsyncCall::Context *ctx) { - auto ret = ImeSystemCmdChannel::GetInstance()->ConnectSystemCmd(manager); + auto ret = ImeSystemCmdChannel::GetInstance()->ConnectSystemCmd(manager); // ImeSystemCmdChannel::GetInstance()統一排查 TODO ctxt->SetErrorCode(ret); CHECK_RETURN_VOID(ret == ErrorCode::NO_ERROR, "ConnectSystemCmd return error!"); ctxt->SetState(napi_ok); @@ -107,7 +107,7 @@ napi_value JsKeyboardPanelManager::Subscribe(napi_env env, napi_callback_info in std::shared_ptr callback = std::make_shared(env, argv[1], std::this_thread::get_id(), AppExecFwk::EventHandler::Current()); - manager->RegisterListener(argv[1], type, callback); + manager->RegisterListener(argv[1], type, callback); // JsKeyboardPanelManager::GetInstance()統一排查 TODO return JsUtil::Const::Null(env); } @@ -222,7 +222,7 @@ napi_value JsKeyboardPanelManager::SendPrivateCommand(napi_env env, napi_callbac auto output = [ctxt](napi_env env, napi_value *result) -> napi_status { return napi_ok; }; auto exec = [ctxt](AsyncCall::Context *ctx) { privateCommandQueue_.Wait(ctxt->info); - int32_t code = ImeSystemCmdChannel::GetInstance()->SendPrivateCommand(ctxt->privateCommand); + int32_t code = ImeSystemCmdChannel::GetInstance()->SendPrivateCommand(ctxt->privateCommand); // ImeSystemCmdChannel::GetInstance()統一排查 TODO privateCommandQueue_.Pop(); if (code == ErrorCode::NO_ERROR) { ctxt->SetState(napi_ok); diff --git a/frameworks/kits/extension/src/inputmethod_extension_context.cpp b/frameworks/kits/extension/src/inputmethod_extension_context.cpp index d63e67e9f5f22ff23006240b6580e378124a5ede..aa4d396ac2ff4cb3287831e3cd6b43258871af5e 100644 --- a/frameworks/kits/extension/src/inputmethod_extension_context.cpp +++ b/frameworks/kits/extension/src/inputmethod_extension_context.cpp @@ -27,7 +27,7 @@ int InputMethodExtensionContext::ILLEGAL_REQUEST_CODE(-1); ErrCode InputMethodExtensionContext::StartAbility(const AAFwk::Want &want) const { IMSA_HILOGD("%{public}s begin.", __func__); - ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want, token_, ILLEGAL_REQUEST_CODE); + ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want, token_, ILLEGAL_REQUEST_CODE); // AbilityManagerClient::GetInstance()統一排查 TODO IMSA_HILOGD("%{public}s ret=%{public}d", __func__, err); if (err != ERR_OK) { IMSA_HILOGE("InputMethodExtensionContext::StartAbility failed: %{public}d", err); diff --git a/frameworks/kits/extension/src/js_inputmethod_extension.cpp b/frameworks/kits/extension/src/js_inputmethod_extension.cpp index 2ecf91cbcc0fe34879dec6834db160e6a474f6cc..c690394547412d24efc14162610316ce16b765af 100644 --- a/frameworks/kits/extension/src/js_inputmethod_extension.cpp +++ b/frameworks/kits/extension/src/js_inputmethod_extension.cpp @@ -89,7 +89,7 @@ napi_value AttachInputMethodExtensionContext(napi_env env, void *value, void *) JsInputMethodExtension *JsInputMethodExtension::Create(const std::unique_ptr &runtime) { IMSA_HILOGI("JsInputMethodExtension Create."); - jsInputMethodExtension = new JsInputMethodExtension(static_cast(*runtime)); + jsInputMethodExtension = new JsInputMethodExtension(static_cast(*runtime)); //runtime TODO return jsInputMethodExtension; } @@ -115,7 +115,7 @@ void JsInputMethodExtension::Init(const std::shared_ptr &rec return; } - std::string moduleName(Extension::abilityInfo_->moduleName); + std::string moduleName(Extension::abilityInfo_->moduleName); // abilityInfo_統一排查 TODO moduleName.append("::").append(abilityInfo_->name); IMSA_HILOGI("JsInputMethodExtension, module: %{public}s, srcPath:%{public}s.", moduleName.c_str(), srcPath.c_str()); HandleScope handleScope(jsRuntime_); @@ -279,7 +279,7 @@ void JsInputMethodExtension::OnStop() InputMethodExtension::OnStop(); IMSA_HILOGI("JsInputMethodExtension OnStop start."); CallObjectMethod("onDestroy"); - bool ret = ConnectionManager::GetInstance().DisconnectCaller(GetContext()->GetToken()); + bool ret = ConnectionManager::GetInstance().DisconnectCaller(GetContext()->GetToken()); // GetContext() TODO if (ret) { IMSA_HILOGI("the input method extension connection is not disconnected."); } diff --git a/frameworks/kits/extension_cj/src/cj_inputmethod_extension_context.cpp b/frameworks/kits/extension_cj/src/cj_inputmethod_extension_context.cpp index 1352cc98b9586456cfdf785e241ba280c5912a9a..c5cf69f34eec51f6842cfa2408bb999d2d820a9b 100644 --- a/frameworks/kits/extension_cj/src/cj_inputmethod_extension_context.cpp +++ b/frameworks/kits/extension_cj/src/cj_inputmethod_extension_context.cpp @@ -22,7 +22,7 @@ static const ErrCode ERROR_INVALIDE_CONTEXT = 16000011; CjInputMethodExtensionContext::CjInputMethodExtensionContext( const std::shared_ptr &context) - : CJExtensionContext(context, context->GetAbilityInfo()), context_(context) + : CJExtensionContext(context, context->GetAbilityInfo()), context_(context) // context TODO { } diff --git a/services/adapter/keyboard/src/input_event_callback.cpp b/services/adapter/keyboard/src/input_event_callback.cpp index 5d092a5fd12bc4c151d53c13f01363b05ef42c85..f0f00ccb27ad54616b3931fdc0ead3de9b70e9f4 100644 --- a/services/adapter/keyboard/src/input_event_callback.cpp +++ b/services/adapter/keyboard/src/input_event_callback.cpp @@ -25,7 +25,7 @@ const std::map MASK_MAP{ void InputEventCallback::OnInputEvent(std::shared_ptr keyEvent) const { - auto keyCode = keyEvent->GetKeyCode(); + auto keyCode = keyEvent->GetKeyCode(); // keyEvent TODO auto keyAction = keyEvent->GetKeyAction(); auto currKey = MASK_MAP.find(keyCode); if (currKey == MASK_MAP.end()) { diff --git a/services/adapter/keyboard/src/keyboard_event.cpp b/services/adapter/keyboard/src/keyboard_event.cpp index 0240fa072ac3b75aead8e829343ff26eef9ed663..4ae1e73449adf559f2f781e8e778dcaa3d10019a 100644 --- a/services/adapter/keyboard/src/keyboard_event.cpp +++ b/services/adapter/keyboard/src/keyboard_event.cpp @@ -30,7 +30,7 @@ int32_t KeyboardEvent::AddKeyEventMonitor(KeyHandle handle) IMSA_HILOGI("KeyboardEvent::AddKeyEventMonitor start."); std::shared_ptr callback = std::make_shared(); callback->SetKeyHandle(handle); - int32_t monitorId = InputManager::GetInstance()->AddMonitor([callback](std::shared_ptr keyEvent) { + int32_t monitorId = InputManager::GetInstance()->AddMonitor([callback](std::shared_ptr keyEvent) { // InputManager::GetInstance()統一排查 TODO if (callback == nullptr) { IMSA_HILOGE("callback is nullptr!"); return; diff --git a/services/identity_checker/src/identity_checker_impl.cpp b/services/identity_checker/src/identity_checker_impl.cpp index eb62d9de19f19ce0fd43fe0ca3c2281ef2c43fb8..0cba7f2d04ee11ab520598a17de362df133681e3 100644 --- a/services/identity_checker/src/identity_checker_impl.cpp +++ b/services/identity_checker/src/identity_checker_impl.cpp @@ -121,7 +121,7 @@ bool IdentityCheckerImpl::IsFocusedUIExtension(uint32_t callingTokenId, sptrCheckUIExtensionIsFocused(callingTokenId, isFocused); + auto ret = AbilityManagerClient::GetInstance()->CheckUIExtensionIsFocused(callingTokenId, isFocused);// GetInstance TODO if (ret != ErrorCode::NO_ERROR) { IMSA_HILOGE("failed to CheckUIExtensionIsFocused, ret: %{public}d", ret); return false; @@ -159,7 +159,7 @@ uint64_t IdentityCheckerImpl::GetDisplayIdByPid(int64_t callingPid, sptrGetUIExtensionSessionInfo(abilityToken, info); + AAFwk::AbilityManagerClient::GetInstance()->GetUIExtensionSessionInfo(abilityToken, info); // GetInstance TODO auto windowId = info.hostWindowId; displayId = WindowAdapter::GetDisplayIdByWindowId(windowId); IMSA_HILOGD("GetDisplayIdByPid displayId: %{public}" PRIu64 "", displayId); diff --git a/services/src/input_method_system_ability.cpp b/services/src/input_method_system_ability.cpp index 36508d4e2386a4f2e4695b0070355c61cffe9947..1404db6bd1876dfcc9bedf3f5179453f8a1854a6 100644 --- a/services/src/input_method_system_ability.cpp +++ b/services/src/input_method_system_ability.cpp @@ -86,7 +86,7 @@ InputMethodSystemAbility::~InputMethodSystemAbility() { stop_ = true; Message *msg = new Message(MessageID::MSG_ID_QUIT_WORKER_THREAD, nullptr); - MessageHandler::Instance()->SendMessage(msg); + MessageHandler::Instance()->SendMessage(msg); // Instance統一排查 TODO if (workThreadHandler.joinable()) { workThreadHandler.join(); } @@ -198,7 +198,7 @@ void InputMethodSystemAbility::OnStart() if (ret != ErrorCode::NO_ERROR) { InputMethodSysEvent::GetInstance().ServiceFaultReporter("imf", ret); auto callback = [=]() { Init(); }; - serviceHandler_->PostTask(callback, INIT_INTERVAL); + serviceHandler_->PostTask(callback, INIT_INTERVAL); // serviceHandler_ 統一排查TODO IMSA_HILOGE("init failed. try again 10s later!"); } InitHiTrace(); @@ -501,7 +501,7 @@ int32_t InputMethodSystemAbility::PrepareForOperateKeyboard(std::shared_ptr &info) { - auto target = ImeInfoInquirer::GetInstance().FindTargetSubtypeByCondition(info->subProps, condition); + auto target = ImeInfoInquirer::GetInstance().FindTargetSubtypeByCondition(info->subProps, condition);// info TODO if (target == nullptr) { IMSA_HILOGE("target is empty!"); return ErrorCode::ERROR_BAD_PARAMETERS; @@ -519,7 +519,7 @@ int32_t InputMethodSystemAbility::SwitchByCondition(const Condition &condition, void InputMethodSystemAbility::SubscribeCommonEvent() { sptr imCommonEventManager = ImCommonEventManager::GetInstance(); - bool isSuccess = imCommonEventManager->SubscribeEvent(); + bool isSuccess = imCommonEventManager->SubscribeEvent(); //ImCommonEventManager::GetInstance() 統一排查TODO if (isSuccess) { IMSA_HILOGI("initialize subscribe service event success."); return; @@ -712,7 +712,7 @@ int32_t InputMethodSystemAbility::CheckInputTypeOption(int32_t userId, InputClie session->RestoreCurrentImeSubType(DEFAULT_DISPLAY_ID); } #ifdef IMF_SCREENLOCK_MGR_ENABLE - if (ScreenLock::ScreenLockManager::GetInstance()->IsScreenLocked()) { + if (ScreenLock::ScreenLockManager::GetInstance()->IsScreenLocked()) { //ScreenLockManager::GetInstance() 統一排查 TODO std::string ime; if (GetScreenLockIme(userId, ime) != ErrorCode::NO_ERROR) { IMSA_HILOGE("not ime screenlocked"); @@ -1240,7 +1240,7 @@ void InputMethodSystemAbility::GetValidSubtype(const std::string &subName, const if (subName.empty()) { IMSA_HILOGW("undefined subtype"); info->subProp.id = UNDEFINED; - info->subProp.name = UNDEFINED; + info->subProp.name = UNDEFINED; //info TODO } } @@ -1315,7 +1315,7 @@ int32_t InputMethodSystemAbility::SwitchExtension(int32_t userId, const std::sha IMSA_HILOGE("%{public}d session is nullptr!", userId); return ErrorCode::ERROR_NULL_POINTER; } - std::string targetImeName = info->prop.name + "/" + info->prop.id; + std::string targetImeName = info->prop.name + "/" + info->prop.id; //info TODO ImeCfgManager::GetInstance().ModifyImeCfg({ userId, targetImeName, info->subProp.id, false }); ImeNativeCfg targetIme = { targetImeName, info->prop.name, info->subProp.id, info->prop.id }; auto ret = session->StartIme(std::make_shared(targetIme)); @@ -1431,7 +1431,7 @@ ErrCode InputMethodSystemAbility::GetDefaultInputMethod(Property &prop, bool isB { std::shared_ptr property = std::make_shared(prop); auto ret = ImeInfoInquirer::GetInstance().GetDefaultInputMethod(GetCallingUserId(), property, isBrief); - if (ret == ErrorCode::NO_ERROR) { + if (ret == ErrorCode::NO_ERROR) { //TODO property prop = *property; } return ret; @@ -1467,7 +1467,7 @@ void InputMethodSystemAbility::WorkThread() { pthread_setname_np(pthread_self(), "OS_IMSAWorkThread"); while (!stop_) { - Message *msg = MessageHandler::Instance()->GetMessage(); + Message *msg = MessageHandler::Instance()->GetMessage(); //Instance()/msg TODO switch (msg->msgId_) { case MSG_ID_USER_START: { OnUserStarted(msg); @@ -1544,7 +1544,7 @@ void InputMethodSystemAbility::WorkThread() */ int32_t InputMethodSystemAbility::OnUserStarted(const Message *msg) { - if (msg->msgContent_ == nullptr) { + if (msg->msgContent_ == nullptr) { // msg TODO IMSA_HILOGE("msgContent_ is nullptr!"); return ErrorCode::ERROR_NULL_POINTER; } diff --git a/services/src/peruser_session.cpp b/services/src/peruser_session.cpp index c67651e7e9f31c76ff2ae14e7cf4d7fecc8ea117..c49452e2a15bbe8a3515a3ec67e7110893d72df2 100644 --- a/services/src/peruser_session.cpp +++ b/services/src/peruser_session.cpp @@ -114,7 +114,7 @@ int32_t PerUserSession::HideKeyboard( IMSA_HILOGE("current client is nullptr!"); return ErrorCode::ERROR_NULL_POINTER; } - auto clientInfo = clientGroup->GetClientInfo(currentClient->AsObject()); + auto clientInfo = clientGroup->GetClientInfo(currentClient->AsObject()); //clientGroup TODO if (clientInfo == nullptr) { IMSA_HILOGE("client info is nullptr!"); return ErrorCode::ERROR_CLIENT_NOT_FOUND; @@ -845,7 +845,7 @@ int32_t PerUserSession::InitInputControlChannel() return ErrorCode::ERROR_NULL_POINTER; } auto data = GetReadyImeData(ImeType::IME); - if (data == nullptr) { + if (data == nullptr) { // data->core 統一排查所有GetReadyImeData的調用処 TODO IMSA_HILOGE("ime: %{public}d is not exist!", ImeType::IME); return ErrorCode::ERROR_IME_NOT_STARTED; } @@ -984,7 +984,7 @@ std::shared_ptr PerUserSession::GetReadyImeData(ImeType type) if (it == imeData_.end()) { return nullptr; } - if (it->second->imeStatus != ImeStatus::READY) { + if (it->second->imeStatus != ImeStatus::READY) { // TODO it->second return nullptr; } return it->second; @@ -1010,7 +1010,7 @@ void PerUserSession::RemoveImeData(ImeType type, bool isImeDied) return; } auto data = it->second; - if (isImeDied && data->core != nullptr && data->core->AsObject() != nullptr) { + if (isImeDied && data->core != nullptr && data->core->AsObject() != nullptr) { // data TODO data->core->AsObject()->RemoveDeathRecipient(data->deathRecipient); } imeData_.erase(type); @@ -1232,7 +1232,7 @@ int32_t PerUserSession::ChangeToDefaultImeIfNeed( IMSA_HILOGD("no need"); return ErrorCode::NO_ERROR; #endif - if (!ScreenLock::ScreenLockManager::GetInstance()->IsScreenLocked()) { + if (!ScreenLock::ScreenLockManager::GetInstance()->IsScreenLocked()) { // GetInstance TODO IMSA_HILOGD("no need"); imeToStart = targetIme; return ErrorCode::NO_ERROR; @@ -1257,7 +1257,7 @@ AAFwk::Want PerUserSession::GetWant(const std::shared_ptr &ime) { bool isolatedSandBox = true; EnabledStatus status = EnabledStatus::BASIC_MODE; - if (ImeEnabledInfoManager::GetInstance().IsDefaultFullMode(userId_, ime->bundleName)) { + if (ImeEnabledInfoManager::GetInstance().IsDefaultFullMode(userId_, ime->bundleName)) { // ime TODO status = EnabledStatus::FULL_EXPERIENCE_MODE; isolatedSandBox = false; } else { @@ -1287,7 +1287,7 @@ int32_t PerUserSession::StartInputService(const std::shared_ptr &i if (ret != ErrorCode::NO_ERROR) { return ret; } - InitImeData({ imeToStart->bundleName, imeToStart->extName }, ime); + InitImeData({ imeToStart->bundleName, imeToStart->extName }, ime); //imeToStart TODO isImeStarted_.Clear(false); sptr connection = new (std::nothrow) ImeConnection(); if (connection == nullptr) { @@ -1343,7 +1343,7 @@ int32_t PerUserSession::OnPanelStatusChange( int32_t PerUserSession::OnUpdateListenEventFlag(const InputClientInfo &clientInfo) { - auto remoteClient = clientInfo.client->AsObject(); + auto remoteClient = clientInfo.client->AsObject(); // clientInfo.client TODO auto ret = AddClientInfo(remoteClient, clientInfo, START_LISTENING); if (ret != ErrorCode::NO_ERROR) { IMSA_HILOGE("failed to AddClientInfo!"); @@ -1784,7 +1784,7 @@ int32_t PerUserSession::UpdateImeData(sptr core, sptrsecond->core = core; + it->second->core = core; // it->second TODO it->second->agent = agent; it->second->pid = pid; it->second->imeStateManager = ImeStateManagerFactory::GetInstance().CreateImeStateManager(pid, [this] { @@ -1813,7 +1813,7 @@ int32_t PerUserSession::InitConnect(pid_t pid) if (it == imeData_.end()) { return ErrorCode::ERROR_NULL_POINTER; } - it->second->pid = pid; + it->second->pid = pid; // it->second TODO return ErrorCode::NO_ERROR; } @@ -1857,7 +1857,7 @@ ImeAction PerUserSession::GetImeAction(ImeEvent action) if (it == imeData_.end()) { return ImeAction::DO_ACTION_IN_NULL_IME_DATA; } - auto iter = imeEventConverter_.find({ it->second->imeStatus, action }); + auto iter = imeEventConverter_.find({ it->second->imeStatus, action }); // it->second TODO if (iter == imeEventConverter_.end()) { IMSA_HILOGE("abnormal!"); return ImeAction::DO_ACTION_IN_IME_EVENT_CONVERT_FAILED; @@ -1990,7 +1990,7 @@ int32_t PerUserSession::ForceStopCurrentIme(bool isNeedWait) AAFwk::Want want; want.SetElementName(imeData->ime.first, imeData->ime.second); - auto ret = AAFwk::AbilityManagerClient::GetInstance()->StopExtensionAbility( + auto ret = AAFwk::AbilityManagerClient::GetInstance()->StopExtensionAbility( //GetInstance TODO want, nullptr, userId_, AppExecFwk::ExtensionAbilityType::INPUTMETHOD); if (ret != ErrorCode::NO_ERROR) { IMSA_HILOGE("StopExtensionAbility [%{public}s, %{public}s] failed, ret: %{public}d!", @@ -2117,7 +2117,7 @@ void PerUserSession::HandleImeBindTypeChanged( bool isClientInactive = false; { std::lock_guard lock(focusedClientLock_); - oldClientInfo = clientGroup->GetCurrentClientInfo(); + oldClientInfo = clientGroup->GetCurrentClientInfo(); // clientGroup TODO if (oldClientInfo == nullptr) { auto inactiveClient = clientGroup->GetInactiveClient(); if (inactiveClient != nullptr) { @@ -2337,7 +2337,7 @@ bool PerUserSession::SpecialScenarioCheck() IMSA_HILOGE("send failed, is collaborative input!"); return false; } - if (ScreenLock::ScreenLockManager::GetInstance()->IsScreenLocked()) { + if (ScreenLock::ScreenLockManager::GetInstance()->IsScreenLocked()) { //GetInstance TODO IMSA_HILOGE("send failed, is screen locked"); return false; } @@ -2403,7 +2403,7 @@ bool PerUserSession::IsDefaultDisplayGroup(uint64_t displayId) void PerUserSession::ClearRequestKeyboardReason(std::shared_ptr &clientInfo) { - clientInfo->requestKeyboardReason = RequestKeyboardReason::NONE; + clientInfo->requestKeyboardReason = RequestKeyboardReason::NONE; //clientInfo TODO } bool PerUserSession::IsNumkeyAutoInputApp(const std::string &bundleName)