mirror of
https://gitee.com/openharmony/accessibility
synced 2024-11-27 00:51:07 +00:00
feat: 系统组件支持64位集成
close: #I5113F Signed-off-by: zff <zhangfanfan2@huawei.com> Change-Id: I76665b6f41bdda2051963fad77785a2d670bed55
This commit is contained in:
parent
f9233a4a84
commit
21e81c6dea
@ -48,7 +48,7 @@ bool AccessibilityExtensionContext::GestureSimulate(uint32_t sequence,
|
||||
|
||||
if (gesturePathDefineList.size() > gesturePathDefineList.front().GetMaxStrokes() ||
|
||||
gesturePathDefineList.size() <= 0) {
|
||||
HILOG_ERROR("The number of gesturePathDefine : [%{public}d] is not allowed.", gesturePathDefineList.size());
|
||||
HILOG_ERROR("The number of gesturePathDefine : [%{public}zu] is not allowed.", gesturePathDefineList.size());
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -56,10 +56,10 @@ bool AccessibilityExtensionContext::GestureSimulate(uint32_t sequence,
|
||||
for (auto gesturePath : gesturePathDefineList) {
|
||||
totalDurationTime += gesturePath.GetDurationTime();
|
||||
}
|
||||
HILOG_DEBUG("The total duration time is %{public}lld.", totalDurationTime);
|
||||
HILOG_DEBUG("The total duration time is %{public}lld.", (long long)totalDurationTime);
|
||||
|
||||
if (totalDurationTime > gesturePathDefineList.front().GetMaxStrokeDuration()) {
|
||||
HILOG_ERROR("The total duration time : [%{public}lld] is not allowed.", totalDurationTime);
|
||||
HILOG_ERROR("The total duration time : [%{public}lld] is not allowed.", (long long)totalDurationTime);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -166,4 +166,4 @@ bool AccessibilityExtensionContext::CheckCommonAction(uint32_t action)
|
||||
}
|
||||
}
|
||||
} // namespace Accessibility
|
||||
} // namespace OHOS
|
||||
} // namespace OHOS
|
||||
|
@ -100,7 +100,7 @@ bool AccessibilityMemo::GetSource(AccessibilityElementInfo &elementInfo) const
|
||||
bool result = false;
|
||||
if (instance != nullptr) {
|
||||
result = instance->SearchElementInfosByAccessibilityId(channelId_, windowId_, elementId_, 0, elementInfos);
|
||||
HILOG_DEBUG("elementInfos' size is [%{public}d]", elementInfos.size());
|
||||
HILOG_DEBUG("elementInfos' size is [%{public}zu]", elementInfos.size());
|
||||
if (!elementInfos.empty()) {
|
||||
HILOG_INFO("called] GetSource OK");
|
||||
result = true;
|
||||
@ -546,4 +546,4 @@ int AccessibilityEventInfo::GetPageId() const
|
||||
return pageId_;
|
||||
}
|
||||
} // namespace Accessibility
|
||||
} // namespace OHOS
|
||||
} // namespace OHOS
|
||||
|
@ -47,11 +47,11 @@ AccessibilityOperator &AccessibilityOperator::GetInstance()
|
||||
}
|
||||
}
|
||||
|
||||
HILOG_DEBUG("new instance instanceSize[%{public}u]", instances_.size());
|
||||
HILOG_DEBUG("new instance instanceSize[%{public}zu]", instances_.size());
|
||||
sptr<AccessibilityOperator> inst(new AccessibilityOperator());
|
||||
instances_.push_back(inst);
|
||||
|
||||
HILOG_DEBUG("End instanceSize[%{public}u]", instances_.size());
|
||||
HILOG_DEBUG("End instanceSize[%{public}zu]", instances_.size());
|
||||
return *(inst.GetRefPtr());
|
||||
}
|
||||
|
||||
@ -104,7 +104,7 @@ bool AccessibilityOperator::GetRoot(int channelId, AccessibilityElementInfo &ele
|
||||
int activeWindow = instance->GetActiveWindow();
|
||||
HILOG_DEBUG("activeWindow is %{public}d", activeWindow);
|
||||
bool result = SearchElementInfosByAccessibilityId(channelId, activeWindow, NONE_ID, 0, elementInfos);
|
||||
HILOG_DEBUG("element [elementSize:%{public}d]", elementInfos.size());
|
||||
HILOG_DEBUG("element [elementSize:%{public}zu]", elementInfos.size());
|
||||
if (!elementInfos.empty()) {
|
||||
elementInfo = elementInfos[0];
|
||||
}
|
||||
@ -154,7 +154,7 @@ bool AccessibilityOperator::SearchElementInfosByAccessibilityId(int channelId,
|
||||
info.SetChannelId(channelId);
|
||||
}
|
||||
asyncElementOperatorMng_.SetOperationStatus(true);
|
||||
HILOG_DEBUG("search element info End[size:%{public}d]", elementInfosResult_.size());
|
||||
HILOG_DEBUG("search element info End[size:%{public}zu]", elementInfosResult_.size());
|
||||
elementInfos = elementInfosResult_;
|
||||
return result;
|
||||
}
|
||||
@ -183,7 +183,7 @@ bool AccessibilityOperator::SearchElementInfosByText(int channelId, int accessib
|
||||
info.SetChannelId(channelId);
|
||||
}
|
||||
asyncElementOperatorMng_.SetOperationStatus(true);
|
||||
HILOG_DEBUG("[size:%{public}d] end", elementInfosResult_.size());
|
||||
HILOG_DEBUG("[size:%{public}zu] end", elementInfosResult_.size());
|
||||
elementInfos = elementInfosResult_;
|
||||
|
||||
return result;
|
||||
@ -283,7 +283,7 @@ bool AccessibilityOperator::ExecuteAction(int channelId, int accessibilityWindow
|
||||
void AccessibilityOperator::SetSearchElementInfoByAccessibilityIdResult(
|
||||
const std::vector<AccessibilityElementInfo> &infos, const int sequenceNum)
|
||||
{
|
||||
HILOG_DEBUG("Response[elementInfoSize:%{public}d] [sequenceNum:%{public}d]",
|
||||
HILOG_DEBUG("Response[elementInfoSize:%{public}zu] [sequenceNum:%{public}d]",
|
||||
infos.size(), sequenceNum);
|
||||
for (auto iter = infos.begin(); iter != infos.end(); iter++) {
|
||||
HILOG_DEBUG("Response");
|
||||
@ -296,7 +296,7 @@ void AccessibilityOperator::SetSearchElementInfoByAccessibilityIdResult(
|
||||
void AccessibilityOperator::SetSearchElementInfoByTextResult(const std::vector<AccessibilityElementInfo> &infos,
|
||||
const int sequenceNum)
|
||||
{
|
||||
HILOG_DEBUG("Response [elementInfoSize:%{public}d] [sequenceNum:%{public}d]",
|
||||
HILOG_DEBUG("Response [elementInfoSize:%{public}zu] [sequenceNum:%{public}d]",
|
||||
infos.size(), sequenceNum);
|
||||
for (auto iter = infos.begin(); iter != infos.end(); iter++) {
|
||||
elementInfosResult_.push_back(*iter);
|
||||
@ -441,4 +441,4 @@ void AccessibilityOperator::SendSimulateGesture(const int channelId,
|
||||
}
|
||||
}
|
||||
} // namespace Accessibility
|
||||
} // namespace OHOS
|
||||
} // namespace OHOS
|
||||
|
@ -557,7 +557,7 @@ void AccessibleAbilityChannelProxy::SendSimulateGesture(const int requestId,
|
||||
return;
|
||||
}
|
||||
if (!data.WriteInt32(gestureSteps.size())) {
|
||||
HILOG_ERROR("gestureSteps.size() write error: %{public}d, ", gestureSteps.size());
|
||||
HILOG_ERROR("gestureSteps.size() write error: %{public}zu, ", gestureSteps.size());
|
||||
return;
|
||||
}
|
||||
for (auto &step : gestureSteps) {
|
||||
@ -571,4 +571,4 @@ void AccessibleAbilityChannelProxy::SendSimulateGesture(const int requestId,
|
||||
}
|
||||
}
|
||||
} // namespace Accessibility
|
||||
} // namespace OHOS
|
||||
} // namespace OHOS
|
||||
|
@ -223,7 +223,7 @@ ErrCode AccessibleAbilityChannelStub::HandleGetWindows(MessageParcel &data, Mess
|
||||
|
||||
vector<AccessibilityWindowInfo> windows = GetWindows();
|
||||
if (!reply.WriteInt32((int32_t)windows.size())) {
|
||||
HILOG_ERROR("windows.size() write error: %{public}d, ", windows.size());
|
||||
HILOG_ERROR("windows.size() write error: %{public}zu, ", windows.size());
|
||||
return ERR_INVALID_VALUE;
|
||||
}
|
||||
for (auto &window : windows) {
|
||||
@ -360,4 +360,4 @@ ErrCode AccessibleAbilityChannelStub::HandleSendSimulateGesture(MessageParcel &d
|
||||
return NO_ERROR;
|
||||
}
|
||||
} // namespace Accessibility
|
||||
} // namespace OHOS
|
||||
} // namespace OHOS
|
||||
|
@ -104,7 +104,7 @@ GesturePathDefine::GesturePathDefine(GesturePathPositionDefine &startPosition,
|
||||
|
||||
int64_t GesturePathDefine::GetDurationTime()
|
||||
{
|
||||
HILOG_DEBUG("start and max stroke duration is %{public}lld", durationTime_);
|
||||
HILOG_DEBUG("start and max stroke duration is %{public}lld", (long long)durationTime_);
|
||||
return durationTime_;
|
||||
}
|
||||
|
||||
@ -116,7 +116,7 @@ GesturePathPositionDefine &GesturePathDefine::GetEndPosition()
|
||||
|
||||
int64_t GesturePathDefine::GetMaxStrokeDuration()
|
||||
{
|
||||
HILOG_DEBUG("start and max stroke duration is %{public}lld", MAX_STROKE_DURATION);
|
||||
HILOG_DEBUG("start and max stroke duration is %{public}lld", (long long)MAX_STROKE_DURATION);
|
||||
return MAX_STROKE_DURATION;
|
||||
}
|
||||
|
||||
|
@ -326,7 +326,7 @@ napi_value NAccessibilityClient::UnsubscribeState(napi_env env, napi_callback_in
|
||||
HILOG_ERROR("UnsubscribeState eventType[%{public}s] is error", eventType.c_str());
|
||||
return nullptr;
|
||||
}
|
||||
HILOG_INFO("observer size%{public}d", NAccessibilityClient::stateListeners_[eventType].size());
|
||||
HILOG_INFO("observer size%{public}zu", NAccessibilityClient::stateListeners_[eventType].size());
|
||||
bool result = true;
|
||||
for (auto it = NAccessibilityClient::stateListeners_[eventType].begin();
|
||||
it != NAccessibilityClient::stateListeners_[eventType].end();) {
|
||||
@ -1146,7 +1146,7 @@ napi_value NAccessibilityClient::GetInstalled(napi_env env, napi_callback_info i
|
||||
if (instance) {
|
||||
callbackInfo->abilityList_ = instance->GetInstalledAbilities();
|
||||
}
|
||||
HILOG_INFO("GetInstalled Executing GetInstalled[%{public}d]", callbackInfo->abilityList_.size());
|
||||
HILOG_INFO("GetInstalled Executing GetInstalled[%{public}zu]", callbackInfo->abilityList_.size());
|
||||
},
|
||||
// Execute the complete function
|
||||
[](napi_env env, napi_status status, void* data) {
|
||||
@ -1204,7 +1204,7 @@ napi_value NAccessibilityClient::GetExtensionEnabled(napi_env env, napi_callback
|
||||
if (instance) {
|
||||
callbackInfo->enabledAbilities_ = instance->GetEnabledAbilities();
|
||||
}
|
||||
HILOG_INFO("GetExtensionEnabled Executing GetExtensionEnabled[%{public}d]",
|
||||
HILOG_INFO("GetExtensionEnabled Executing GetExtensionEnabled[%{public}zu]",
|
||||
callbackInfo->enabledAbilities_.size());
|
||||
},
|
||||
// Execute the complete function
|
||||
@ -1543,7 +1543,7 @@ napi_value NAccessibilityClient::RegisterCaptionStateCallback(napi_env env, napi
|
||||
|
||||
napi_value NAccessibilityClient::DeregisterCaptionStateCallback(napi_env env, napi_callback_info info)
|
||||
{
|
||||
HILOG_INFO("start observer size%{public}d", NAccessibilityClient::captionListeners_.size());
|
||||
HILOG_INFO("start observer size%{public}zu", NAccessibilityClient::captionListeners_.size());
|
||||
bool retValue = true;
|
||||
size_t argc = ARGS_SIZE_TWO;
|
||||
napi_value args[ARGS_SIZE_TWO] = {0};
|
||||
@ -1964,4 +1964,4 @@ napi_value NAccessibilityClient::SetCaptionWindowColor(napi_env env, napi_callba
|
||||
napi_value ret = nullptr;
|
||||
napi_get_undefined(env, &ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
@ -719,7 +719,7 @@ void ConvertElementInfosToJS(
|
||||
napi_env env, napi_value result, const std::vector<OHOS::Accessibility::AccessibilityElementInfo>& elementInfos)
|
||||
{
|
||||
size_t index = 0;
|
||||
HILOG_DEBUG("ConvertElementInfosToJS: elementInfo size(%{public}d)", elementInfos.size());
|
||||
HILOG_DEBUG("ConvertElementInfosToJS: elementInfo size(%{public}zu)", elementInfos.size());
|
||||
|
||||
for (auto& elementInfo : elementInfos) {
|
||||
napi_value obj = nullptr;
|
||||
@ -1418,7 +1418,7 @@ bool ConvertEventInfoJSToNAPI(napi_env env, napi_value object, AccessibilityEven
|
||||
napi_value contentsValue = nullptr;
|
||||
napi_get_property(env, object, propertyNameValue, &contentsValue);
|
||||
napi_value data = nullptr;
|
||||
size_t dataLen = 0;
|
||||
uint32_t dataLen = 0;
|
||||
napi_get_array_length(env, contentsValue, &dataLen);
|
||||
for (int i = 0; i < int(dataLen); i++) {
|
||||
napi_get_element(env, contentsValue, i, &data);
|
||||
@ -1882,7 +1882,7 @@ void ConvertJSToAccessibleAbilityInfos(napi_env env, napi_value arrayValue,
|
||||
AccessibilityAbilityInfo info = {};
|
||||
ConvertJSToAccessibleAbilityInfo(env, value, info);
|
||||
accessibleAbilityInfos.push_back(info);
|
||||
HILOG_DEBUG("size = %{public}d ", accessibleAbilityInfos.size());
|
||||
HILOG_DEBUG("size = %{public}zu ", accessibleAbilityInfos.size());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -100,7 +100,7 @@ void AccessibilityAccountData::AddConnectedAbility(sptr<AccessibleAbilityConnect
|
||||
connectedA11yAbilities_.insert(make_pair(connection->GetElementName().GetURI(), connection));
|
||||
}
|
||||
|
||||
HILOG_DEBUG("Add ConnectedAbility: %{public}d", connectedA11yAbilities_.size());
|
||||
HILOG_DEBUG("Add ConnectedAbility: %{public}zu", connectedA11yAbilities_.size());
|
||||
}
|
||||
|
||||
void AccessibilityAccountData::RemoveConnectedAbility(sptr<AccessibleAbilityConnection>& connection)
|
||||
@ -112,7 +112,7 @@ void AccessibilityAccountData::RemoveConnectedAbility(sptr<AccessibleAbilityConn
|
||||
connectedA11yAbilities_.erase(it);
|
||||
}
|
||||
|
||||
HILOG_DEBUG("Remove ConnectedAbility: %{public}d", connectedA11yAbilities_.size());
|
||||
HILOG_DEBUG("Remove ConnectedAbility: %{public}zu", connectedA11yAbilities_.size());
|
||||
}
|
||||
|
||||
void AccessibilityAccountData::AddStateCallback(const sptr<IAccessibleAbilityManagerServiceState>& callback)
|
||||
@ -175,7 +175,7 @@ void AccessibilityAccountData::AddConnectingA11yAbility(const AppExecFwk::Elemen
|
||||
connectingA11yAbilities_.insert(make_pair(elementName.GetURI(), elementName));
|
||||
}
|
||||
|
||||
HILOG_DEBUG("Add ConnectingA11yAbility: %{public}d", connectingA11yAbilities_.size());
|
||||
HILOG_DEBUG("Add ConnectingA11yAbility: %{public}zu", connectingA11yAbilities_.size());
|
||||
}
|
||||
|
||||
void AccessibilityAccountData::RemoveConnectingA11yAbility(const AppExecFwk::ElementName& elementName)
|
||||
@ -186,7 +186,7 @@ void AccessibilityAccountData::RemoveConnectingA11yAbility(const AppExecFwk::Ele
|
||||
connectingA11yAbilities_.erase(it);
|
||||
}
|
||||
|
||||
HILOG_DEBUG("Remove ConnectingA11yAbility: %{public}d", connectingA11yAbilities_.size());
|
||||
HILOG_DEBUG("Remove ConnectingA11yAbility: %{public}zu", connectingA11yAbilities_.size());
|
||||
}
|
||||
|
||||
void AccessibilityAccountData::AddEnabledAbility(const AppExecFwk::ElementName& elementName)
|
||||
@ -196,7 +196,7 @@ void AccessibilityAccountData::AddEnabledAbility(const AppExecFwk::ElementName&
|
||||
enabledAbilities_.insert(make_pair(elementName.GetURI(), elementName));
|
||||
}
|
||||
|
||||
HILOG_DEBUG("Add EnabledAbility: %{public}d", enabledAbilities_.size());
|
||||
HILOG_DEBUG("Add EnabledAbility: %{public}zu", enabledAbilities_.size());
|
||||
}
|
||||
|
||||
void AccessibilityAccountData::RemoveEnabledFromPref(const std::string bundleName)
|
||||
@ -234,7 +234,7 @@ void AccessibilityAccountData::RemoveEnabledFromPref(const std::string bundleNam
|
||||
void AccessibilityAccountData::RemoveEnabledAbility(const AppExecFwk::ElementName& elementName)
|
||||
{
|
||||
std::map<std::string, AppExecFwk::ElementName>::iterator it = enabledAbilities_.find(elementName.GetURI());
|
||||
HILOG_DEBUG("EnabledAbility size(%{public}d)", enabledAbilities_.size());
|
||||
HILOG_DEBUG("EnabledAbility size(%{public}zu)", enabledAbilities_.size());
|
||||
if (it != enabledAbilities_.end()) {
|
||||
HILOG_DEBUG("Removed %{public}s from EnabledAbility: ", elementName.GetBundleName().c_str());
|
||||
enabledAbilities_.erase(it);
|
||||
@ -252,7 +252,7 @@ void AccessibilityAccountData::AddInstalledAbility(AccessibilityAbilityInfo& abi
|
||||
}
|
||||
}
|
||||
installedAbilities_.push_back(abilityInfo);
|
||||
HILOG_DEBUG("push back installed ability successfully and installedAbilities_'s size is %{public}d",
|
||||
HILOG_DEBUG("push back installed ability successfully and installedAbilities_'s size is %{public}zu",
|
||||
installedAbilities_.size());
|
||||
}
|
||||
|
||||
@ -335,7 +335,7 @@ const std::map<std::string, AppExecFwk::ElementName> AccessibilityAccountData::G
|
||||
|
||||
const std::map<std::string, AppExecFwk::ElementName> AccessibilityAccountData::GetEnabledAbilities()
|
||||
{
|
||||
HILOG_DEBUG("enabledAbilities_ size is (%{public}d).", enabledAbilities_.size());
|
||||
HILOG_DEBUG("enabledAbilities_ size is (%{public}zu).", enabledAbilities_.size());
|
||||
for (auto& abilitie : enabledAbilities_) {
|
||||
std::string bundleName = abilitie.second.GetBundleName();
|
||||
HILOG_DEBUG("bundleName = %{public}s ", bundleName.c_str());
|
||||
@ -357,12 +357,12 @@ const std::vector<AccessibilityAbilityInfo> AccessibilityAccountData::GetAbiliti
|
||||
for (auto ability : connectedA11yAbilities_) {
|
||||
enabledAbilities.push_back(ability.second->GetAbilityInfo());
|
||||
}
|
||||
HILOG_DEBUG("connectedA11yAbilities_ is (%{public}d) enabledAbilities is (%{public}d).",
|
||||
HILOG_DEBUG("connectedA11yAbilities_ is (%{public}zu) enabledAbilities is (%{public}zu).",
|
||||
connectedA11yAbilities_.size(), enabledAbilities.size());
|
||||
return enabledAbilities;
|
||||
} else if (state == ABILITY_STATE_DISABLE) {
|
||||
std::vector<AccessibilityAbilityInfo> disabledAbilities = GetDisableAbilities();
|
||||
HILOG_DEBUG("the size of disable abilities is %{public}d", disabledAbilities.size());
|
||||
HILOG_DEBUG("the size of disable abilities is %{public}zu", disabledAbilities.size());
|
||||
return disabledAbilities;
|
||||
} else {
|
||||
return installedAbilities_;
|
||||
@ -645,7 +645,7 @@ bool AccessibilityAccountData::GetInstalledAbilitiesFromBMS()
|
||||
return false;
|
||||
}
|
||||
bms->QueryExtensionAbilityInfos(AppExecFwk::ExtensionAbilityType::ACCESSIBILITY, id_, extensionInfos);
|
||||
HILOG_DEBUG("query extensionAbilityInfos' size is %{public}d.", extensionInfos.size());
|
||||
HILOG_DEBUG("query extensionAbilityInfos' size is %{public}zu.", extensionInfos.size());
|
||||
for (auto& info : extensionInfos) {
|
||||
std::shared_ptr<AccessibilityAbilityInfo> accessibilityInfo =
|
||||
std::make_shared<AccessibilityAbilityInfo>(info);
|
||||
|
@ -198,7 +198,7 @@ void TouchEventInjector::InjectEventsInner()
|
||||
if (injectedEvents_[i]) {
|
||||
int64_t timeout = (injectedEvents_[i]->GetActionTime() - curTime) / MS_TO_US;
|
||||
if (timeout < 0) {
|
||||
HILOG_INFO("timeout is error.%{public}lld", timeout);
|
||||
HILOG_INFO("timeout is error.%{public}lld", (long long)timeout);
|
||||
} else {
|
||||
handler_->SendEvent(SEND_TOUCH_EVENT_MSG, parameters, timeout);
|
||||
}
|
||||
@ -282,4 +282,4 @@ int64_t TouchEventInjector::getSystemTime()
|
||||
return microsecond;
|
||||
}
|
||||
} // namespace Accessibility
|
||||
} // namespace OHOS
|
||||
} // namespace OHOS
|
||||
|
@ -85,7 +85,7 @@ void AccessibilityWindowListener::OnWindowUpdate(const sptr<Rosen::Accessibility
|
||||
break;
|
||||
}
|
||||
winMgr.UpdateWindowLayer(windowInfo);
|
||||
HILOG_DEBUG("winMgr.a11yWindows[%{public}d]", winMgr.a11yWindows_.size());
|
||||
HILOG_DEBUG("winMgr.a11yWindows[%{public}zu]", winMgr.a11yWindows_.size());
|
||||
}
|
||||
|
||||
AccessibilityWindowInfoManager &AccessibilityWindowInfoManager::GetInstance()
|
||||
@ -254,12 +254,12 @@ void AccessibilityWindowInfoManager::SetInputFocusedWindow(int windowId)
|
||||
|
||||
std::vector<AccessibilityWindowInfo> AccessibilityWindowInfoManager::GetAccessibilityWindows()
|
||||
{
|
||||
HILOG_DEBUG("a11yWindows_ size[%{public}d]", a11yWindows_.size());
|
||||
HILOG_DEBUG("a11yWindows_ size[%{public}zu]", a11yWindows_.size());
|
||||
std::vector<AccessibilityWindowInfo> windows;
|
||||
for (auto window : a11yWindows_) {
|
||||
windows.push_back(window.second);
|
||||
}
|
||||
HILOG_DEBUG("window size[%{public}d]", windows.size());
|
||||
HILOG_DEBUG("window size[%{public}zu]", windows.size());
|
||||
for (auto logWindow : windows) {
|
||||
HILOG_DEBUG("logWindow id[%{public}d]", logWindow.GetWindowId());
|
||||
}
|
||||
@ -312,4 +312,4 @@ void AccessibilityWindowInfoManager::UpdateWindowLayer(const sptr<Rosen::Accessi
|
||||
}
|
||||
}
|
||||
} // namespace Accessibility
|
||||
} // namespace OHOS
|
||||
} // namespace OHOS
|
||||
|
@ -223,7 +223,7 @@ uint32_t AccessibleAbilityManagerService::RegisterCaptionPropertyCallback(
|
||||
}
|
||||
callback->AsObject()->AddDeathRecipient(captionPropertyCallbackDeathRecipient_);
|
||||
accountData->AddCaptionPropertyCallback(callback);
|
||||
HILOG_DEBUG("the size of caption property callbacks is %{public}d",
|
||||
HILOG_DEBUG("the size of caption property callbacks is %{public}zu",
|
||||
accountData->GetCaptionPropertyCallbacks().size());
|
||||
return NO_ERROR;
|
||||
}
|
||||
@ -283,14 +283,14 @@ vector<AccessibilityAbilityInfo> AccessibleAbilityManagerService::GetAbilityList
|
||||
|
||||
AbilityStateType state = static_cast<AbilityStateType>(stateType);
|
||||
vector<AccessibilityAbilityInfo> abilities = accountData->GetAbilitiesByState(state);
|
||||
HILOG_DEBUG("abilityes count is %{public}d", abilities.size());
|
||||
HILOG_DEBUG("abilityes count is %{public}zu", abilities.size());
|
||||
for (auto& ability : abilities) {
|
||||
if (abilityTypes == AccessibilityAbilityTypes::ACCESSIBILITY_ABILITY_TYPE_ALL ||
|
||||
(ability.GetAccessibilityAbilityType() & abilityTypes)) {
|
||||
infoList.push_back(ability);
|
||||
}
|
||||
}
|
||||
HILOG_DEBUG("infoList count is %{public}d", infoList.size());
|
||||
HILOG_DEBUG("infoList count is %{public}zu", infoList.size());
|
||||
return infoList;
|
||||
}
|
||||
|
||||
@ -689,7 +689,7 @@ void AccessibleAbilityManagerService::PackageAdd(std::string& bundleName)
|
||||
}
|
||||
bundleMgrProxy->QueryExtensionAbilityInfos(
|
||||
AppExecFwk::ExtensionAbilityType::ACCESSIBILITY, GetCurrentAccountId(), extensionInfos);
|
||||
HILOG_DEBUG("query extensionAbilityInfos' size is %{public}d.", extensionInfos.size());
|
||||
HILOG_DEBUG("query extensionAbilityInfos' size is %{public}zu.", extensionInfos.size());
|
||||
for (auto newAbility : extensionInfos) {
|
||||
if (newAbility.bundleName == bundleName) {
|
||||
HILOG_DEBUG("The package added is an extension ability and\
|
||||
@ -700,7 +700,7 @@ void AccessibleAbilityManagerService::PackageAdd(std::string& bundleName)
|
||||
return;
|
||||
}
|
||||
packageAccount->AddInstalledAbility(*accessibilityInfo);
|
||||
HILOG_DEBUG("add new extension ability successfully and installed abilities's size is %{public}d",
|
||||
HILOG_DEBUG("add new extension ability successfully and installed abilities's size is %{public}zu",
|
||||
packageAccount->GetInstalledAbilities().size());
|
||||
hasNewExtensionAbility = true;
|
||||
break;
|
||||
@ -738,7 +738,7 @@ void AccessibleAbilityManagerService::PackageChanged(std::string& bundleName)
|
||||
}
|
||||
bundleMgrProxy->QueryExtensionAbilityInfos(
|
||||
AppExecFwk::ExtensionAbilityType::ACCESSIBILITY, GetCurrentAccountId(), extensionInfos);
|
||||
HILOG_DEBUG("query extensionAbilityInfos' size is %{public}d.", extensionInfos.size());
|
||||
HILOG_DEBUG("query extensionAbilityInfos' size is %{public}zu.", extensionInfos.size());
|
||||
for (auto changedAbility : extensionInfos) {
|
||||
if (changedAbility.bundleName == bundleName) {
|
||||
HILOG_DEBUG("The package changed is an extension ability and\
|
||||
@ -746,7 +746,7 @@ void AccessibleAbilityManagerService::PackageChanged(std::string& bundleName)
|
||||
std::shared_ptr<AccessibilityAbilityInfo> accessibilityInfo =
|
||||
std::make_shared<AccessibilityAbilityInfo>(changedAbility);
|
||||
packageAccount->AddInstalledAbility(*accessibilityInfo);
|
||||
HILOG_DEBUG("update new extension ability successfully and installed abilities's size is %{public}d",
|
||||
HILOG_DEBUG("update new extension ability successfully and installed abilities's size is %{public}zu",
|
||||
packageAccount->GetInstalledAbilities().size());
|
||||
hasChanged = true;
|
||||
break;
|
||||
@ -828,7 +828,7 @@ void AccessibleAbilityManagerService::UpdateAbilities()
|
||||
}
|
||||
|
||||
vector<AccessibilityAbilityInfo> installedAbilities = accountData->GetInstalledAbilities();
|
||||
HILOG_DEBUG("installedAbilities is %{public}d.", installedAbilities.size());
|
||||
HILOG_DEBUG("installedAbilities is %{public}zu.", installedAbilities.size());
|
||||
for (auto& installAbility : installedAbilities) {
|
||||
// temp deal: deviceId
|
||||
std::string deviceId;
|
||||
@ -1281,4 +1281,4 @@ void AccessibleAbilityManagerService::OnRemoveSystemAbility(int32_t systemAbilit
|
||||
HILOG_DEBUG("systemAbilityId:%{public}d removed!", systemAbilityId);
|
||||
}
|
||||
} // namespace Accessibility
|
||||
} // namespace OHOS
|
||||
} // namespace OHOS
|
||||
|
Loading…
Reference in New Issue
Block a user