From 723dd074bd04bd04e548d7319506ca874f7d7c5c Mon Sep 17 00:00:00 2001
From: gf721 <gaofeng105@huawei.com>
Date: Wed, 31 Aug 2022 09:50:17 +0800
Subject: [PATCH] 1

Signed-off-by: gf721 <gaofeng105@huawei.com>
---
 frameworks/innerkits/file_access/BUILD.gn                | 2 ++
 .../innerkits/file_access/src/file_access_helper.cpp     | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/frameworks/innerkits/file_access/BUILD.gn b/frameworks/innerkits/file_access/BUILD.gn
index 78e238b3..667bc4a5 100644
--- a/frameworks/innerkits/file_access/BUILD.gn
+++ b/frameworks/innerkits/file_access/BUILD.gn
@@ -28,6 +28,8 @@ config("ability_config") {
     "${ability_runtime_napi_path}/inner/napi_common",
     "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
+    "//foundation/bundlemanager/bundle_framework/interfaces/kits/js/bundlemgr",
+    "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
   ]
 
   cflags = []
diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp
index 39e44c23..afff1052 100644
--- a/frameworks/innerkits/file_access/src/file_access_helper.cpp
+++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp
@@ -16,18 +16,21 @@
 #include "file_access_helper.h"
 
 #include "bundle_mgr_proxy.h"
+#include "bundle_mgr.h"
 #include "file_access_framework_errno.h"
 #include "hilog_wrapper.h"
 #include "hitrace_meter.h"
 #include "if_system_ability_manager.h"
 #include "ifile_access_ext_base.h"
+#include "ipc_skeleton.h"
 #include "iservice_registry.h"
 #include "system_ability_definition.h"
+#include "bundle_constants.h"
 
 namespace OHOS {
 namespace FileAccessFwk {
 namespace {
-    static const int32_t DEFAULT_USERID = 100;
+    int userid = IPCSkeleton::GetCallingUid() / AppExecFwk::Constants::BASE_USER_RANGE;
     static const std::string SCHEME_NAME = "datashare";
     static const std::string MEDIA_BNUDLE_NAME_ALIAS = "media";
     static const std::string MEDIA_BNUDLE_NAME = "com.ohos.medialibrary.medialibrarydata";
@@ -187,7 +190,7 @@ std::shared_ptr<FileAccessHelper> FileAccessHelper::Creator(
     std::unordered_map<std::string, std::shared_ptr<ConnectInfo>> cMap;
     std::vector<AppExecFwk::ExtensionAbilityInfo> extensionInfos;
     bool ret = bm->QueryExtensionAbilityInfos(
-        AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos);
+        AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, userid, extensionInfos);
     if (!ret) {
         HILOG_ERROR("FileAccessHelper::Creator QueryExtensionAbilityInfos failed");
         return nullptr;
@@ -590,7 +593,7 @@ std::vector<AAFwk::Want> FileAccessHelper::GetRegisterFileAccessExtAbilityInfo()
     std::vector<AppExecFwk::ExtensionAbilityInfo> extensionInfos;
     sptr<AppExecFwk::IBundleMgr> bm = FileAccessHelper::GetBundleMgrProxy();
     bool ret = bm->QueryExtensionAbilityInfos(
-        AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos);
+        AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, userid, extensionInfos);
     if (!ret) {
         HILOG_ERROR("FileAccessHelper::GetRegisterFileAccessExtAbilityInfo QueryExtensionAbilityInfos error");
         return wants;
-- 
Gitee