openharmony/accessibility
1
0
Fork 0
mirror of https://gitee.com/openharmony/accessibility synced 2025-03-02 21:35:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!223 添加用于DFX打点所需的函数返回值

Browse Source 
Merge pull request !223 from Mupceet/release_0629_addDFXpoint
This commit is contained in:
openharmony_ci 2022-06-29 12:31:55 +00:00 committed by Gitee
commit c71a16e812
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/aams/include/accessible_ability_manager_service.h
View File

@ -269,7 +269,7 @@ private:
std::shared_ptr<AAMSEventHandler> handler_;
sptr<IRemoteObject::DeathRecipient> stateCallbackDeathRecipient_ = nullptr;
sptr<IRemoteObject::DeathRecipient> interactionOperationDeathRecipient_ = nullptr;
std::map<int32_t, sptr<IRemoteObject::DeathRecipient>> interactionOperationDeathRecipients_ {};
sptr<IRemoteObject::DeathRecipient> captionPropertyCallbackDeathRecipient_ = nullptr;
sptr<IRemoteObject::DeathRecipient> enableAbilityListsObserverDeathRecipient_ = nullptr;
sptr<IRemoteObject::DeathRecipient> configCallbackDeathRecipient_ = nullptr;

6
services/aams/src/accessibility_account_data.cpp
View File

@ -563,7 +563,11 @@ bool AccessibilityAccountData::GetInstalledAbilitiesFromBMS()
HILOG_ERROR("GetBundleMgrProxy failed.");
return false;
}
bms->QueryExtensionAbilityInfos(AppExecFwk::ExtensionAbilityType::ACCESSIBILITY, id_, extensionInfos);
bool ret = bms->QueryExtensionAbilityInfos(AppExecFwk::ExtensionAbilityType::ACCESSIBILITY, id_, extensionInfos);
if (!ret) {
HILOG_ERROR("Query extension ability information failed.");
return false;
}
HILOG_DEBUG("query extensionAbilityInfos' size is %{public}zu.", extensionInfos.size());
for (auto& info : extensionInfos) {
AccessibilityAbilityInitParams initParams;

34
services/aams/src/accessible_ability_manager_service.cpp
View File

@ -398,21 +398,18 @@ void AccessibleAbilityManagerService::RegisterElementOperator(
}
accountData->AddAccessibilityWindowConnection(windowId, connection);
if (!interactionOperationDeathRecipient_) {
interactionOperationDeathRecipient_ = new(std::nothrow) InteractionOperationDeathRecipient(windowId);
if (!interactionOperationDeathRecipient_) {
HILOG_ERROR("interactionOperationDeathRecipient_ is null");
auto object = operation->AsObject();
if (object) {
sptr<IRemoteObject::DeathRecipient> deathRecipient =
new(std::nothrow) InteractionOperationDeathRecipient(windowId);
if (!deathRecipient) {
HILOG_ERROR("Create interactionOperationDeathRecipient failed");
return;
}
}
if (connection->GetProxy()) {
auto object = connection->GetProxy()->AsObject();
if (object) {
HILOG_DEBUG("Add death recipient of operation");
bool result = object->AddDeathRecipient(interactionOperationDeathRecipient_);
HILOG_DEBUG("The result of adding operation's death recipient is %{public}d", result);
}
bool result = object->AddDeathRecipient(deathRecipient);
interactionOperationDeathRecipients_[windowId] = deathRecipient;
HILOG_DEBUG("The result of adding operation's death recipient is %{public}d", result);
}
}), "TASK_REGISTER_ELEMENT_OPERATOR");
}
@ -440,9 +437,13 @@ void AccessibleAbilityManagerService::DeregisterElementOperator(int32_t windowId
if (connection->GetProxy()) {
auto object = connection->GetProxy()->AsObject();
if (object) {
HILOG_DEBUG("Delete death recipient of operation");
bool result = object->RemoveDeathRecipient(interactionOperationDeathRecipient_);
HILOG_DEBUG("The result of deleting operation's death recipient is %{public}d", result);
auto iter = interactionOperationDeathRecipients_.find(windowId);
if (iter != interactionOperationDeathRecipients_.end()) {
sptr<IRemoteObject::DeathRecipient> deathRecipient = iter->second;
bool result = object->RemoveDeathRecipient(deathRecipient);
HILOG_DEBUG("The result of deleting operation's death recipient is %{public}d", result);
interactionOperationDeathRecipients_.erase(iter);
}
}
}
@ -859,8 +860,7 @@ bool AccessibleAbilityManagerService::Init()
void AccessibleAbilityManagerService::InteractionOperationDeathRecipient::OnRemoteDied(
const wptr<IRemoteObject> &remote)
{
HILOG_DEBUG();
std::lock_guard<std::mutex> lock(mutex_);
HILOG_INFO();
Singleton<AccessibleAbilityManagerService>::GetInstance().DeregisterElementOperator(windowId_);
}