!18187 merge master into master

add trace

Created-by: littlejerry1
Commit-by: unknown
Merged-by: openharmony_ci
Description: **IssueNo**:https://gitcode.com/openharmony/ability_ability_runtime/issues/14352

**Description**:add trace

**稳定性自检:**
NA

**安全编码自检:**
NA

**TDD Result**:
NA

**XTS Result**:
NA

### 是否已执行L0用例
- [ ] 已验证
- [NA] 不涉及。如不涉及,请写明理由


See merge request: openharmony/ability_ability_runtime!18187
This commit is contained in:
openharmony_ci
2026-01-31 17:18:54 +08:00
4 changed files with 10 additions and 4 deletions
@@ -40,6 +40,7 @@ AgentManagerClient &AgentManagerClient::GetInstance()
int32_t AgentManagerClient::GetAllAgentCards(std::vector<AgentCard> &cards)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
auto agentMgr = GetAgentMgrProxy();
if (agentMgr == nullptr) {
TAG_LOGE(AAFwkTag::SER_ROUTER, "null agentmgr");
@@ -56,6 +57,7 @@ int32_t AgentManagerClient::GetAllAgentCards(std::vector<AgentCard> &cards)
int32_t AgentManagerClient::GetAgentCardsByBundleName(const std::string &bundleName, std::vector<AgentCard> &cards)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
auto agentMgr = GetAgentMgrProxy();
if (agentMgr == nullptr) {
TAG_LOGE(AAFwkTag::SER_ROUTER, "null agentmgr");
@@ -67,6 +69,7 @@ int32_t AgentManagerClient::GetAgentCardsByBundleName(const std::string &bundleN
int32_t AgentManagerClient::GetAgentCardByAgentId(const std::string &bundleName, const std::string &agentId,
AgentCard &card)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
auto agentMgr = GetAgentMgrProxy();
if (agentMgr == nullptr) {
TAG_LOGE(AAFwkTag::SER_ROUTER, "null agentmgr");
@@ -71,6 +71,9 @@ int32_t AgentCardMgr::HandleBundleInstall(const std::string &bundleName, int32_t
}
for (auto cardStr : j["agent_cards"]) {
AgentCard card = AgentCard::FromJson(cardStr);
card.bundleName = bundleName;
card.moduleName = extensionInfo.moduleName;
card.abilityName = extensionInfo.name;
cards.push_back(card);
}
}
@@ -19,7 +19,7 @@ export default namespace agentManager {
export native function nativeGetAllAgentCards(): Array<AgentCard>;
export native function nativeGetAgentCardsByBundleName(bundleName: string): Array<AgentCard>;
export native function nativeGetAgentCardByUrl(bundleName: string, url: string): AgentCard;
export native function nativeGetAgentCardByAgentId(bundleName: string, agentId: string): AgentCard;
export function getAllAgentCards(): Promise<Array<AgentCard>> {
let p: Promise<Array<AgentCard>> = new Promise<Array<AgentCard>>(
@@ -51,11 +51,11 @@ export default namespace agentManager {
return p;
}
export function getAgentCardByUrl(bundleName: string, url: string): Promise<AgentCard> {
export function getAgentCardByAgentId(bundleName: string, agentId: string): Promise<AgentCard> {
let p: Promise<AgentCard> = new Promise<AgentCard>(
(res: (data: AgentCard) => void, rej: (error: Error) => void): void => {
taskpool.execute((): AgentCard => {
return agentManager.nativeGetAgentCardByUrl(bundleName, url);
return agentManager.nativeGetAgentCardByAgentId(bundleName, agentId);
}).then((e: Any) => {
let card: AgentCard = e as AgentCard;
res(card);
+1 -1
View File
@@ -4,7 +4,7 @@
{
"name": 185,
"libpath": "libagentmgr.z.so",
"run-on-create": false,
"run-on-create": true,
"distributed": false,
"dump_level": 1,
"min_hdi_proxy_version": []