diff --git a/services/audio_policy/server/infra/appclient/src/audio_bundle_manager.cpp b/services/audio_policy/server/infra/appclient/src/audio_bundle_manager.cpp index 92b132013630dd86462acd600fb9235024695ce9..9d66549e5bec35cf559799765d67b8553c9c2255 100644 --- a/services/audio_policy/server/infra/appclient/src/audio_bundle_manager.cpp +++ b/services/audio_policy/server/infra/appclient/src/audio_bundle_manager.cpp @@ -81,8 +81,8 @@ std::string AudioBundleManager::GetBundleNameFromUid(int32_t callingUid) sptr bundleMgrProxy = OHOS::iface_cast(remoteObject); CHECK_AND_RETURN_RET_LOG(bundleMgrProxy != nullptr, "", "bundleMgrProxy is nullptr"); - WatchTimeout reguard("bundleMgrProxy->GetNameForUid:GetBundleNameFromUid"); - bundleMgrProxy->GetNameForUid(callingUid, bundleName); + WatchTimeout reguard("bundleMgrProxy->GetBundleNameForUid:GetBundleNameFromUid"); + bundleMgrProxy->GetBundleNameForUid(callingUid, bundleName); reguard.CheckCurrTimeout(); return bundleName; @@ -110,8 +110,8 @@ AppExecFwk::BundleInfo AudioBundleManager::GetBundleInfoFromUid(int32_t callingU sptr bundleMgrProxy = OHOS::iface_cast(remoteObject); CHECK_AND_RETURN_RET_LOG(bundleMgrProxy != nullptr, bundleInfo, "bundleMgrProxy is nullptr"); - WatchTimeout reguard("bundleMgrProxy->GetNameForUid:GetBundleInfoFromUid"); - bundleMgrProxy->GetNameForUid(callingUid, bundleName); + WatchTimeout reguard("bundleMgrProxy->GetBundleNameForUid:GetBundleInfoFromUid"); + bundleMgrProxy->GetBundleNameForUid(callingUid, bundleName); bundleMgrProxy->GetBundleInfoV9(bundleName, AppExecFwk::BundleFlag::GET_BUNDLE_DEFAULT | AppExecFwk::BundleFlag::GET_BUNDLE_WITH_ABILITIES | diff --git a/services/audio_service/client/src/audio_system_manager.cpp b/services/audio_service/client/src/audio_system_manager.cpp index 992a247cee8f0cb8bc1b1bfeceddc995dac1777b..05f3c2f9043151fe1eea648070fc1843735bd51e 100644 --- a/services/audio_service/client/src/audio_system_manager.cpp +++ b/services/audio_service/client/src/audio_system_manager.cpp @@ -300,8 +300,8 @@ std::string AudioSystemManager::GetSelfBundleName(int32_t uid) sptr iBundleMgr = iface_cast(remoteObject); CHECK_AND_RETURN_RET_LOG(iBundleMgr != nullptr, bundleName, "bundlemgr interface is null"); - WatchTimeout reguard("bundleMgrProxy->GetNameForUid:GetSelfBundleName"); - iBundleMgr->GetNameForUid(uid, bundleName); + WatchTimeout reguard("bundleMgrProxy->GetBundleNameForUid:GetSelfBundleName"); + iBundleMgr->GetBundleNameForUid(uid, bundleName); reguard.CheckCurrTimeout(); return bundleName; } diff --git a/services/audio_service/common/src/app_bundle_manager.cpp b/services/audio_service/common/src/app_bundle_manager.cpp index 5404db65ea161e24d9f793121417f135441e1bdc..e1c34e31f475021d949f13356ebc86b40e7f436c 100644 --- a/services/audio_service/common/src/app_bundle_manager.cpp +++ b/services/audio_service/common/src/app_bundle_manager.cpp @@ -49,8 +49,8 @@ std::string AppBundleManager::GetBundleNameFromUid(int32_t uid) sptr bundleMgrProxy = OHOS::iface_cast(remoteObject); CHECK_AND_RETURN_RET_LOG(bundleMgrProxy != nullptr, "", "bundleMgrProxy is nullptr"); - WatchTimeout reguard("bundleMgrProxy->GetNameForUid:GetBundleNameFromUid"); - bundleMgrProxy->GetNameForUid(uid, bundleName); + WatchTimeout reguard("bundleMgrProxy->GetBundleNameForUid:GetBundleNameFromUid"); + bundleMgrProxy->GetBundleNameForUid(uid, bundleName); reguard.CheckCurrTimeout(); return bundleName; diff --git a/services/audio_service/server/src/audio_server.cpp b/services/audio_service/server/src/audio_server.cpp index 5a4e81ba44499bc14717e25a12d30deeb5f26a51..5192a34f881f202ba8adef3c7d01b8ebaaf4b019 100644 --- a/services/audio_service/server/src/audio_server.cpp +++ b/services/audio_service/server/src/audio_server.cpp @@ -1572,8 +1572,8 @@ int32_t AudioServer::GetHapBuildApiVersion(int32_t callerUid) sptr bundleMgrProxy = OHOS::iface_cast(remoteObject); CHECK_AND_RETURN_RET_LOG(bundleMgrProxy != nullptr, 0, "failed: bundleMgrProxy is nullptr"); - WatchTimeout reguard("bundleMgrProxy->GetNameForUid:GetHapBuildApiVersion"); - bundleMgrProxy->GetNameForUid(callerUid, bundleName); + WatchTimeout reguard("bundleMgrProxy->GetBundleNameForUid:GetHapBuildApiVersion"); + bundleMgrProxy->GetBundleNameForUid(callerUid, bundleName); bundleMgrProxy->GetBundleInfoV9(bundleName, AppExecFwk::BundleFlag::GET_BUNDLE_DEFAULT | AppExecFwk::BundleFlag::GET_BUNDLE_WITH_ABILITIES | AppExecFwk::BundleFlag::GET_BUNDLE_WITH_REQUESTED_PERMISSION |