openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-23 06:40:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1569 fix:add XCollie at OnStart

Browse Source 
Merge pull request !1569 from 吴成文/master
This commit is contained in:
openharmony_ci 2024-11-05 13:10:30 +00:00 committed by Gitee
commit 0e7bade298
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/src/input_method_system_ability.cpp
View File

@ -46,6 +46,8 @@
#include "system_language_observer.h" #include "system_language_observer.h"
#include "user_session_manager.h" #include "user_session_manager.h"
#include "wms_connection_observer.h" #include "wms_connection_observer.h"
#include "xcollie/xcollie.h"
#include "xcollie/xcollie_define.h"
namespace OHOS { namespace OHOS {
namespace MiscServices { namespace MiscServices {
@ -57,6 +59,7 @@ constexpr std::int32_t INIT_INTERVAL = 10000L;
constexpr const char *UNDEFINED = "undefined"; constexpr const char *UNDEFINED = "undefined";
static const std::string PERMISSION_CONNECT_IME_ABILITY = "ohos.permission.CONNECT_IME_ABILITY"; static const std::string PERMISSION_CONNECT_IME_ABILITY = "ohos.permission.CONNECT_IME_ABILITY";
std::shared_ptr<AppExecFwk::EventHandler> InputMethodSystemAbility::serviceHandler_; std::shared_ptr<AppExecFwk::EventHandler> InputMethodSystemAbility::serviceHandler_;
constexpr uint32_t START_SA_TIMEOUT = 6; // 6s
InputMethodSystemAbility::InputMethodSystemAbility(int32_t systemAbilityId, bool runOnCreate) InputMethodSystemAbility::InputMethodSystemAbility(int32_t systemAbilityId, bool runOnCreate)
: SystemAbility(systemAbilityId, runOnCreate), state_(ServiceRunningState::STATE_NOT_START) : SystemAbility(systemAbilityId, runOnCreate), state_(ServiceRunningState::STATE_NOT_START)
@ -87,6 +90,8 @@ void InputMethodSystemAbility::OnStart()
IMSA_HILOGI("imsa service is already running."); IMSA_HILOGI("imsa service is already running.");
return; return;
} }
auto id = HiviewDFX::XCollie::GetInstance().SetTimer(
"IMSA OnStart timeout", START_SA_TIMEOUT, nullptr, nullptr, HiviewDFX::XCOLLIE_FLAG_DEFAULT);
InitServiceHandler(); InitServiceHandler();
Initialize(); Initialize();
int32_t ret = Init(); int32_t ret = Init();
@ -99,6 +104,7 @@ void InputMethodSystemAbility::OnStart()
InitHiTrace(); InitHiTrace();
InputMethodSyncTrace tracer("InputMethodController Attach trace."); InputMethodSyncTrace tracer("InputMethodController Attach trace.");
InputmethodDump::GetInstance().AddDumpAllMethod([this](int fd) { this->DumpAllMethod(fd); }); InputmethodDump::GetInstance().AddDumpAllMethod([this](int fd) { this->DumpAllMethod(fd); });
HiviewDFX::XCollie::GetInstance().CancelTimer(id);
IMSA_HILOGI("start imsa service success."); IMSA_HILOGI("start imsa service success.");
return; return;
} }