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

!1426 fix RemoveDeathRecipient

Browse Source 
Merge pull request !1426 from ht/master
This commit is contained in:
openharmony_ci 2024-08-29 14:52:34 +00:00 committed by Gitee
commit d1c333a063
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frameworks/native/inputmethod_controller/src/input_method_controller.cpp
View File

@ -171,11 +171,11 @@ sptr<IInputMethodSystemAbility> InputMethodController::GetSystemAbilityProxy()
void InputMethodController::RemoveDeathRecipient()
{
std::lock_guard<std::mutex> lock(abilityLock_);
if (abilityManager_ == nullptr || deathRecipient_ == nullptr) {
return;
if (abilityManager_ != nullptr && abilityManager_->AsObject() != nullptr && deathRecipient_ != nullptr) {
abilityManager_->AsObject()->RemoveDeathRecipient(deathRecipient_);
}
abilityManager_->AsObject()->RemoveDeathRecipient(deathRecipient_);
deathRecipient_ = nullptr;
abilityManager_ = nullptr;
}
void InputMethodController::DeactivateClient()
@ -356,6 +356,12 @@ int32_t InputMethodController::Close()
return ReleaseInput(clientInfo_.client);
}
void InputMethodController::Reset()
{
Close();
RemoveDeathRecipient();
}
int32_t InputMethodController::RequestShowInput()
{
auto proxy = GetSystemAbilityProxy();
@ -498,7 +504,6 @@ int32_t InputMethodController::ReleaseInput(sptr<IInputClient> &client)
if (ret == ErrorCode::NO_ERROR) {
OnInputStop();
}
RemoveDeathRecipient();
SetTextListener(nullptr);
return ret;
}

10
interfaces/inner_api/inputmethod_controller/include/input_method_controller.h
View File

@ -778,6 +778,16 @@ public:
*/
IMF_API bool IsCurrentImeByPid(int32_t pid);
/**
* @brief Reset controller.
*
* This function is used to reset controller.
* Do not call this interface unless you know what you are doing
*
* @since 12
*/
IMF_API void Reset();
private:
InputMethodController();
~InputMethodController();