openharmony/appexecfwk_standard
1
0
Fork 0
mirror of https://github.com/openharmony/appexecfwk_standard.git synced 2026-07-21 01:15:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

sync code

Browse Source 
Signed-off-by: shilei <shilei91@huawei.com>
Change-Id: I57b0f8171f2575b1bc758dacfffc6e2a20abf2cc
This commit is contained in:
shilei
2021-12-25 07:16:27 +00:00
parent bdf95043d2
commit 095928f452
4 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README_zh.md
+2 -4
View File
@@ -833,10 +833,9 @@ function OnReceiveEvent(err, data) {
```
bundle.getBundleInstaller().then((data) => {
data.install(['/data/test.hap'], {
param: {
userId: 0,
installFlag: 1,
isKeepData: false
}
}, OnReceiveinstallEvent);
function OnReceiveinstallEvent(err, data) {
@@ -873,10 +872,9 @@ bundle.getBundleInstaller().then((data) => {
```
bundle.getBundleInstaller().then((data) => {
data.uninstall('com.example.myapplication', {
param: {
userId: 0,
installFlag: 1,
isKeepData: false
}
}, OnReceiveinstallEvent);
function OnReceiveinstallEvent(err, data) {
interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_status_callback_proxy.cpp
+4
View File
@@ -85,6 +85,10 @@ std::string TransformResult(ErrCode resultCode)
return "ERR_APPEXECFWK_INSTALL_VERSION_NOT_COMPATIBLE";
case ERR_APPEXECFWK_INSTALL_INVALID_NUMBER_OF_ENTRY_HAP:
return "ERR_APPEXECFWK_INSTALL_INVALID_NUMBER_OF_ENTRY_HAP";
case ERR_APPEXECFWK_INSTALL_DISK_MEM_INSUFFICIENT:
return "ERR_APPEXECFWK_INSTALL_DISK_MEM_INSUFFICIENT";
case ERR_APPEXECFWK_FAILED_SERVICE_DIED:
return "ERR_APPEXECFWK_FAILED_SERVICE_DIED";
case ERR_APPEXECFWK_PARSE_UNEXPECTED:
return "ERR_APPEXECFWK_PARSE_UNEXPECTED";
case ERR_APPEXECFWK_PARSE_MISSING_BUNDLE:
kits/appkit/napi/bundlemgr/bundle_mgr.cpp
+12 -28
View File
@@ -74,9 +74,7 @@ enum class InstallErrorCode {
STATUS_RECOVER_FAILURE_INVALID = 0x0D,
STATUS_ABILITY_NOT_FOUND = 0x40,
STATUS_BMS_SERVICE_ERROR = 0x41,
STATUS_BMS_SERVICE_DIED = 0x42,
STATUS_FAILED_GET_INSTALLER_PROXY = 0X43,
STATUS_FAILED_INSUFFICIENT_DISK_MEMORY = 0X44,
STATUS_FAILED_NO_SPACE_LEFT = 0X42,
};
const std::string PERMISSION_CHANGE = "permissionChange";
@@ -2333,22 +2331,8 @@ static bool ParseInstallParam(napi_env env, InstallParam &installParam, napi_val
HILOG_ERROR("args type incorrect!");
return false;
}
HILOG_INFO("-----ParseInstallParam type-----");
napi_value installProp = nullptr;
status = napi_get_named_property(env, args, "param", &installProp);
if (status != napi_ok) {
HILOG_ERROR("cannot find property param");
return false;
}
napi_typeof(env, installProp, &valueType);
if (valueType != napi_object) {
HILOG_ERROR("param type incorrect!");
return false;
}
HILOG_INFO("-----ParseInstallParam InstallParam-----");
napi_value property = nullptr;
status = napi_get_named_property(env, installProp, "userId", &property);
status = napi_get_named_property(env, args, "userId", &property);
if (status != napi_ok) {
HILOG_ERROR("cannot find property userId");
return false;
@@ -2364,7 +2348,7 @@ static bool ParseInstallParam(napi_env env, InstallParam &installParam, napi_val
HILOG_INFO("ParseInstallParam userId=%{public}d.", installParam.userId);
property = nullptr;
status = napi_get_named_property(env, installProp, "installFlag", &property);
status = napi_get_named_property(env, args, "installFlag", &property);
if (status != napi_ok) {
HILOG_ERROR("cannot find property installFlag");
return false;
@@ -2380,7 +2364,7 @@ static bool ParseInstallParam(napi_env env, InstallParam &installParam, napi_val
HILOG_INFO("ParseInstallParam installFlag=%{public}d.", installParam.installFlag);
property = nullptr;
status = napi_get_named_property(env, installProp, "isKeepData", &property);
status = napi_get_named_property(env, args, "isKeepData", &property);
if (status != napi_ok) {
HILOG_ERROR("cannot find property isKeepData");
return false;
@@ -2494,16 +2478,13 @@ static void ConvertInstallResult(InstallResult &installResult)
installResult.resultMsg = "STATUS_RECOVER_FAILURE_INVALID";
break;
case static_cast<int32_t>(IStatusReceiver::ERR_FAILED_SERVICE_DIED):
installResult.resultCode = static_cast<int32_t>(InstallErrorCode::STATUS_BMS_SERVICE_DIED);
installResult.resultMsg = "STATUS_BMS_SERVICE_DIED";
break;
case static_cast<int32_t>(IStatusReceiver::ERR_FAILED_GET_INSTALLER_PROXY):
installResult.resultCode = static_cast<int32_t>(InstallErrorCode::STATUS_FAILED_GET_INSTALLER_PROXY);
installResult.resultMsg = "STATUS_FAILED_GET_INSTALLER_PROXY";
installResult.resultCode = static_cast<int32_t>(InstallErrorCode::STATUS_BMS_SERVICE_ERROR);
installResult.resultMsg = "STATUS_BMS_SERVICE_ERROR";
break;
case static_cast<int32_t>(IStatusReceiver::ERR_INSTALL_DISK_MEM_INSUFFICIENT):
installResult.resultCode = static_cast<int32_t>(InstallErrorCode::STATUS_FAILED_INSUFFICIENT_DISK_MEMORY);
installResult.resultMsg = "STATUS_FAILED_INSUFFICIENT_DISK_MEMORY";
installResult.resultCode = static_cast<int32_t>(InstallErrorCode::STATUS_FAILED_NO_SPACE_LEFT);
installResult.resultMsg = "STATUS_FAILED_NO_SPACE_LEFT";
break;
default:
installResult.resultCode = static_cast<int32_t>(InstallErrorCode::STATUS_BMS_SERVICE_ERROR);
@@ -2547,7 +2528,10 @@ napi_value Install(napi_env env, napi_callback_info info)
HILOG_INFO("Install asyncCallback.");
napi_valuetype valuetype = napi_undefined;
NAPI_CALL(env, napi_typeof(env, argv[ARGS_SIZE_TWO], &valuetype));
NAPI_ASSERT(env, valuetype == napi_function, "Wrong argument type. Function expected.");
if (valuetype != napi_function) {
HILOG_ERROR("Wrong argument type. Function expected.");
return nullptr;
}
napi_create_reference(env, argv[ARGS_SIZE_TWO], NAPI_RETURN_ONE, &asyncCallbackInfo->callback);
napi_value resourceName;
services/bundlemgr/src/installd/installd_host_impl.cpp
+2 -2
View File
@@ -69,12 +69,12 @@ ErrCode InstalldHostImpl::ExtractModuleFiles(const std::string &srcModulePath, c
}
if (!InstalldOperator::MkRecursiveDir(targetPath, true)) {
APP_LOGE("create target dir %{public}s failed", targetPath.c_str());
return ERR_APPEXECFWK_INSTALLD_EXTRACT_FILES_FAILED;
return ERR_APPEXECFWK_INSTALLD_CREATE_DIR_FAILED;
}
if (!InstalldOperator::ExtractFiles(srcModulePath, targetPath)) {
APP_LOGE("extract %{public}s to %{public}s failed", srcModulePath.c_str(), targetPath.c_str());
InstalldOperator::DeleteDir(targetPath);
return ERR_APPEXECFWK_INSTALLD_EXTRACT_FILES_FAILED;
return ERR_APPEXECFWK_INSTALL_DISK_MEM_INSUFFICIENT;
}
return ERR_OK;
}