diff --git a/frameworks/js/napi/kiosk_manager/js_kiosk_manager.cpp b/frameworks/js/napi/kiosk_manager/js_kiosk_manager.cpp index 3cc9764d45df61aa7805f4c47b53f5466d093eee..16b1e55528931f32f37ccc9b0adb29330e18cef5 100644 --- a/frameworks/js/napi/kiosk_manager/js_kiosk_manager.cpp +++ b/frameworks/js/napi/kiosk_manager/js_kiosk_manager.cpp @@ -33,7 +33,6 @@ namespace OHOS { namespace AbilityRuntime { using AbilityManagerClient = AAFwk::AbilityManagerClient; namespace { -constexpr size_t ARGC_ZERO = 0; constexpr size_t ARGC_ONE = 1; constexpr size_t INDEX_ZERO = 0; @@ -42,7 +41,6 @@ public: JsKioskManager() = default; ~JsKioskManager() = default; - static napi_value UpdateKioskApplicationList(napi_env env, napi_callback_info info); static napi_value EnterKioskMode(napi_env env, napi_callback_info info); static napi_value ExitKioskMode(napi_env env, napi_callback_info info); static napi_value GetKioskStatus(napi_env env, napi_callback_info info); @@ -55,7 +53,6 @@ public: private: static napi_value CreateJsKioskStatus(napi_env env, std::shared_ptr kioskStatus); - napi_value OnUpdateKioskApplicationList(napi_env env, NapiCallbackInfo &info); napi_value OnEnterKioskMode(napi_env env, NapiCallbackInfo &info); napi_value OnExitKioskMode(napi_env env, NapiCallbackInfo &info); napi_value OnGetKioskStatus(napi_env env, NapiCallbackInfo &info); @@ -83,52 +80,6 @@ napi_value JsKioskManager::CreateJsKioskStatus(napi_env env, return objValue; } -napi_value JsKioskManager::UpdateKioskApplicationList(napi_env env, napi_callback_info info) -{ - GET_NAPI_INFO_AND_CALL(env, info, JsKioskManager, OnUpdateKioskApplicationList); -} - -napi_value JsKioskManager::OnUpdateKioskApplicationList(napi_env env, NapiCallbackInfo &info) -{ - TAG_LOGD(AAFwkTag::APPKIT, "On Update Kiosk AppList"); - if (info.argc < ARGC_ONE) { - TAG_LOGE(AAFwkTag::APPKIT, "too few params"); - ThrowTooFewParametersError(env); - return CreateJsUndefined(env); - } - auto innerErrCode = std::make_shared(ERR_OK); - - std::vector appList; - if (!OHOS::AppExecFwk::UnwrapArrayStringFromJS(env, info.argv[ARGC_ZERO], appList)) { - TAG_LOGE(AAFwkTag::APPKIT, "app list is invalid"); - ThrowInvalidParamError(env, "Failed to parse application list. Application list must be an Array."); - return CreateJsUndefined(env); - } - NapiAsyncTask::ExecuteCallback execute = [innerErrCode, appList]() { - auto amsClient = AbilityManagerClient::GetInstance(); - if (amsClient == nullptr) { - TAG_LOGE(AAFwkTag::APPKIT, "null amsClient"); - *innerErrCode = static_cast(AAFwk::INNER_ERR); - return; - } - *innerErrCode = amsClient->UpdateKioskApplicationList(appList); - }; - - auto complete = [innerErrCode](napi_env env, NapiAsyncTask &task, int32_t status) { - if (*innerErrCode != ERR_OK) { - TAG_LOGE(AAFwkTag::APPKIT, "innerErrCode=%{public}d", *innerErrCode); - task.Reject(env, CreateJsErrorByNativeErr(env, *innerErrCode)); - return; - } - task.ResolveWithNoError(env, CreateJsUndefined(env)); - }; - napi_value result = nullptr; - NapiAsyncTask::Schedule("JsKioskManager::OnUpdateKioskApplicationList", env, - CreateAsyncTaskWithLastParam(env, nullptr, std::move(execute), - std::move(complete), &result)); - return result; -} - napi_value JsKioskManager::EnterKioskMode(napi_env env, napi_callback_info info) { GET_NAPI_INFO_AND_CALL(env, info, JsKioskManager, OnEnterKioskMode); @@ -282,9 +233,6 @@ napi_value JsKioskManagerInit(napi_env env, napi_value exportObj) nullptr); const char *moduleName = "JsKioskManager"; - - BindNativeFunction(env, exportObj, "updateKioskAppList", moduleName, - JsKioskManager::UpdateKioskApplicationList); BindNativeFunction(env, exportObj, "enterKioskMode", moduleName, JsKioskManager::EnterKioskMode); BindNativeFunction(env, exportObj, "exitKioskMode", moduleName, JsKioskManager::ExitKioskMode); BindNativeFunction(env, exportObj, "getKioskStatus", moduleName, JsKioskManager::GetKioskStatus); diff --git a/frameworks/native/ability/native/ability_business_error/ability_business_error.cpp b/frameworks/native/ability/native/ability_business_error/ability_business_error.cpp index 477a1cc50a6da86831e6d1f7c09031e187bfc87a..58874b74f12bd66f9f831542941460ce24829c65 100644 --- a/frameworks/native/ability/native/ability_business_error/ability_business_error.cpp +++ b/frameworks/native/ability/native/ability_business_error/ability_business_error.cpp @@ -121,7 +121,7 @@ constexpr const char* ERROR_MSG_NO_U1 = "The target bundle is not in u1"; constexpr const char* ERROR_MSG_KIOSK_MODE_NOT_IN_WHITELIST = "The current application is not in the kiosk whitelist."; constexpr const char* ERROR_MSG_ALREADY_IN_KIOSK_MODE = "The system is already in the kiosk mode."; constexpr const char* ERROR_MSG_NOT_IN_KIOSK_MODE = - "The current application is not in the kiosk mode. Exit is not allowed."; + "The system is not in the kiosk mode. Exit is not allowed."; constexpr const char* ERROR_MSG_APP_NOT_IN_FOCUS = "The current ability is not foreground."; // follow ERR_BUNDLE_MANAGER_BUNDLE_NOT_EXIST of appexecfwk_errors.h in bundle_framework