diff --git a/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp b/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp index 1bec2eedcf334908e957a0df7befbda66629858c..877915d443d72c5ce7ddf67cbe7971e9b168f074 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_request_permission.cpp @@ -236,13 +236,6 @@ bool RequestAsyncContext::IsDynamicRequest() permList.emplace_back(permState); } auto ret = AccessToken::AccessTokenKit::GetSelfPermissionsState(permList, this->info); - if (ret == AccessToken::FORBIDDEN_OPER) { - LOGE(ATM_DOMAIN, ATM_TAG, "FORBIDDEN_OPER"); - for (auto& perm : permList) { - perm.state = AccessToken::INVALID_OPER; - perm.errorReason = PRIVACY_STATEMENT_NOT_AGREED; - } - } for (const auto& permState : permList) { LOGI(ATM_DOMAIN, ATM_TAG, "Permission: %{public}s: state: %{public}d, errorReason: %{public}d", permState.permissionName.c_str(), permState.state, permState.errorReason); diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp index 37a96aa453c9cc5d735fa07865bf67653557c32b..8f38dc21c7a9e4b2f17630bc66948fefcbfc3024 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp @@ -428,12 +428,6 @@ bool NapiRequestPermission::IsDynamicRequest(std::shared_ptrinfo); - if (ret == FORBIDDEN_OPER) { // if app is under control, change state from default -1 to 2 - for (auto& perm : permList) { - perm.state = INVALID_OPER; - perm.errorReason = PRIVACY_STATEMENT_NOT_AGREED; - } - } LOGI(ATM_DOMAIN, ATM_TAG, "TokenID: %{public}d, bundle: %{public}s, uiExAbility: %{public}s, serExAbility: %{public}s.", asyncContext->tokenId, asyncContext->info.grantBundleName.c_str(), diff --git a/interfaces/innerkits/accesstoken/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h index 33710406e07ded1514e04e3ab1cbfab5cf4c562a..7ef9e8eb17dbf9201ab007f40c156fd90e6a9716 100644 --- a/interfaces/innerkits/accesstoken/include/access_token.h +++ b/interfaces/innerkits/accesstoken/include/access_token.h @@ -278,10 +278,8 @@ typedef enum TypePermissionErrorReason { PRIVACY_STATEMENT_NOT_AGREED = 4, /** The permission cannot be requested in a pop-up window */ UNABLE_POP_UP = 5, - /** The permission is fixed by policy */ - FIXED_BY_POLICY = 6, /* The permission is manual setting */ - MANUAL_SETTING_PERM = 7, + MANUAL_SETTING_PERM = 6, /** The service is abnormal */ SERVICE_ABNORMAL = 12, } PermissionErrorReason; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp index c859ee8f462afa497ae61293dacb10aec9d7becd..ce2c30cc292bacaaaf5b08c46c8a4d1d33bddba3 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp @@ -222,7 +222,7 @@ bool PermissionManager::HandlePermissionDeniedCase(uint32_t goalGrantFlag, Permi } if ((goalGrantFlag & PERMISSION_FIXED_BY_ADMIN_POLICY) != 0) { permState.state = FORBIDDEN_OPER; - permState.errorReason = FIXED_BY_POLICY; + permState.errorReason = UNABLE_POP_UP; return true; } if ((goalGrantFlag & PERMISSION_ADMIN_POLICIES_CANCEL) != 0) {