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

!113 修复uitest连接失败的问题

Browse Source 
Merge pull request !113 from yichengzhao/weekly
This commit is contained in:
openharmony_ci 2022-04-21 10:00:08 +00:00 committed by Gitee
commit b271b553bf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/aams/include/accessible_ability_connection.h
View File

@ -79,6 +79,17 @@ public:
int32_t GetChannelId();
void OnAbilityConnectDoneSync(const AppExecFwk::ElementName &element, const sptr<IRemoteObject> &remoteObject,
int32_t resultCode)
{
InnerOnAbilityConnectDone(element, remoteObject, resultCode);
}
void OnAbilityDisconnectDoneSync(const AppExecFwk::ElementName &element, int32_t resultCode)
{
InnerOnAbilityDisconnectDone(element, resultCode);
}
private:
class AccessibleAbilityConnectionDeathRecipient final : public IRemoteObject::DeathRecipient {
public:

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

@ -1494,7 +1494,7 @@ void AccessibleAbilityManagerService::AddUITestClient(const sptr<IRemoteObject>
HILOG_ERROR("connection is null");
return;
}
connection->OnAbilityConnectDone(*elementName, obj, 0);
connection->OnAbilityConnectDoneSync(*elementName, obj, 0);
}
bool AccessibleAbilityManagerService::DisableUITestAbility()
@ -1545,7 +1545,7 @@ void AccessibleAbilityManagerService::RemoveUITestClient(sptr<AccessibleAbilityC
return;
}
accountData->RemoveInstalledAbility(UI_TEST_BUNDLE_NAME);
connection->OnAbilityDisconnectDone(connection->GetElementName(), 0);
connection->OnAbilityDisconnectDoneSync(connection->GetElementName(), 0);
}
int32_t AccessibleAbilityManagerService::GetActiveWindow()

15
services/aams/test/mock/src/mock_accessible_ability_connection.cpp
View File

@ -276,5 +276,20 @@ void AccessibleAbilityConnection::OnAccessibilityEvent(AccessibilityEventInfo &e
{
(void)eventInfo;
}
void AccessibleAbilityConnection::InnerOnAbilityConnectDone(const AppExecFwk::ElementName &element,
const sptr<IRemoteObject> &remoteObject, int32_t resultCode)
{
(void)element;
(void)remoteObject;
(void)resultCode;
}
void AccessibleAbilityConnection::InnerOnAbilityDisconnectDone(const AppExecFwk::ElementName &element,
int32_t resultCode)
{
(void)element;
(void)resultCode;
}
} // namespace Accessibility
} // namespace OHOS