diff --git a/interfaces/innerkits/privacy/include/privacy_error.h b/interfaces/innerkits/privacy/include/privacy_error.h new file mode 100644 index 0000000000000000000000000000000000000000..8f76aa8d01438ce42e6b6f16587403a450f6a5ad --- /dev/null +++ b/interfaces/innerkits/privacy/include/privacy_error.h @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef INTERFACES_INNERKITS_ERROR_H +#define INTERFACES_INNERKITS_ERROR_H +namespace OHOS { +namespace Security { +namespace AccessToken { +enum PrivacyError { + ERR_PARAM_INVALID = 1, + ERR_SERVICE_ABNORMAL, + ERR_IPC_PARCEL_FAILED, + ERR_MALLOC_FAILED, + ERR_TOKENID_NOT_EXIST, + ERR_PERMISSION_NOT_EXIST, + ERR_CALLBACK_EXIST, + ERR_CALLBACK_NOT_EXIST, + ERR_CALLBACKS_EXCEED_LIMITATION, + ERR_PERMISSION_IS_ALREADY_START_USING, + + ERR_PERMISSION_DENIED, +}; +} // namespace AccessToken +} // namespace Security +} // namespace OHOS +#endif diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp index a32ea5ca393802c51e751356cca3864dca79d106..5f01156fa6288a9714c5aedaf3d1c6279eb06d3b 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp @@ -18,6 +18,7 @@ #include "accesstoken_log.h" #include "data_validator.h" #include "iservice_registry.h" +#include "privacy_error.h" #include "privacy_manager_proxy.h" namespace OHOS { @@ -50,12 +51,12 @@ int32_t PrivacyManagerClient::AddPermissionUsedRecord( if (!DataValidator::IsTokenIDValid(tokenID) || !DataValidator::IsPermissionNameValid(permissionName) || (successCount < 0 || failCount < 0)) { ACCESSTOKEN_LOG_ERROR(LABEL, "parameter is invalid"); - return ERROR; + return PrivacyError::ERR_PARAM_INVALID; } auto proxy = GetProxy(); if (proxy == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } return proxy->AddPermissionUsedRecord(tokenID, permissionName, successCount, failCount); } @@ -64,12 +65,12 @@ int32_t PrivacyManagerClient::StartUsingPermission(AccessTokenID tokenID, const { if (!DataValidator::IsTokenIDValid(tokenID) || !DataValidator::IsPermissionNameValid(permissionName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "parameter is invalid"); - return ERROR; + return PrivacyError::ERR_PARAM_INVALID; } auto proxy = GetProxy(); if (proxy == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } return proxy->StartUsingPermission(tokenID, permissionName); } @@ -78,12 +79,12 @@ int32_t PrivacyManagerClient::StopUsingPermission(AccessTokenID tokenID, const s { if (!DataValidator::IsTokenIDValid(tokenID) || !DataValidator::IsPermissionNameValid(permissionName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "parameter is invalid"); - return ERROR; + return PrivacyError::ERR_PARAM_INVALID; } auto proxy = GetProxy(); if (proxy == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } return proxy->StopUsingPermission(tokenID, permissionName); } @@ -92,12 +93,12 @@ int32_t PrivacyManagerClient::RemovePermissionUsedRecords(AccessTokenID tokenID, { if (!DataValidator::IsTokenIDValid(tokenID) && !DataValidator::IsDeviceIdValid(deviceID)) { ACCESSTOKEN_LOG_ERROR(LABEL, "parameter is invalid"); - return ERROR; + return PrivacyError::ERR_PARAM_INVALID; } auto proxy = GetProxy(); if (proxy == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } return proxy->RemovePermissionUsedRecords(tokenID, deviceID); } @@ -108,14 +109,14 @@ int32_t PrivacyManagerClient::GetPermissionUsedRecords( auto proxy = GetProxy(); if (proxy == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } PermissionUsedRequestParcel requestParcel; - PermissionUsedResultParcel reultParcel; + PermissionUsedResultParcel resultParcel; requestParcel.request = request; - int32_t ret = proxy->GetPermissionUsedRecords(requestParcel, reultParcel); - result = reultParcel.result; + int32_t ret = proxy->GetPermissionUsedRecords(requestParcel, resultParcel); + result = resultParcel.result; return ret; } @@ -125,7 +126,7 @@ int32_t PrivacyManagerClient::GetPermissionUsedRecords(const PermissionUsedReque auto proxy = GetProxy(); if (proxy == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } PermissionUsedRequestParcel requestParcel; @@ -140,19 +141,19 @@ int32_t PrivacyManagerClient::CreateActiveStatusChangeCbk( if (activeCbkMap_.size() == MAX_PERM_LIST_SIZE) { ACCESSTOKEN_LOG_ERROR(LABEL, "the maximum number of subscribers has been reached"); - return ERROR; + return PrivacyError::ERR_CALLBACKS_EXCEED_LIMITATION; } auto goalCallback = activeCbkMap_.find(callback); if (goalCallback != activeCbkMap_.end()) { ACCESSTOKEN_LOG_ERROR(LABEL, "activeCbkMap_ already has such callback"); - return ERROR; + return PrivacyError::ERR_CALLBACK_EXIST; } else { callbackWrap = new (std::nothrow) PermActiveStatusChangeCallback(callback); if (!callbackWrap) { ACCESSTOKEN_LOG_ERROR(LABEL, "memory allocation for callbackWrap failed!"); - return ERROR; + return PrivacyError::EERR_MALLOC_FAILED; } } return RET_SUCCESS; @@ -164,7 +165,7 @@ int32_t PrivacyManagerClient::RegisterPermActiveStatusCallback( ACCESSTOKEN_LOG_INFO(LABEL, "called!"); if (callback == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "customizedCb is nullptr"); - return ERROR; + return PrivacyError::ERR_PARAM_INVALID; } sptr callbackWrap = nullptr; @@ -176,7 +177,7 @@ int32_t PrivacyManagerClient::RegisterPermActiveStatusCallback( auto proxy = GetProxy(); if (proxy == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } std::vector permList; callback->GetPermList(permList); @@ -199,13 +200,13 @@ int32_t PrivacyManagerClient::UnRegisterPermActiveStatusCallback( auto goalCallback = activeCbkMap_.find(callback); if (goalCallback == activeCbkMap_.end()) { ACCESSTOKEN_LOG_ERROR(LABEL, "goalCallback already is not exist"); - return ERROR; + return PrivacyError::ERR_CALLBACK_NOT_EXIST; } auto proxy = GetProxy(); if (proxy == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } int32_t result = proxy->UnRegisterPermActiveStatusCallback(goalCallback->second->AsObject()); diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index dc7fb7a8c7ec84d63903ff2396ee1f9a4dda1364..1a5515a35b1b9cf3c1d6efbd56dd3cc3e1a37800 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -16,6 +16,7 @@ #include "privacy_manager_proxy.h" #include "accesstoken_log.h" +#include "privacy_error.h" namespace OHOS { namespace Security { @@ -42,25 +43,25 @@ int32_t PrivacyManagerProxy::AddPermissionUsedRecord(AccessTokenID tokenID, cons data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); if (!data.WriteUint32(tokenID)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteUint32(%{public}d)", tokenID); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } if (!data.WriteString(permissionName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteString(permissionName)"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } if (!data.WriteInt32(successCount)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteUint32(successCount)"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } if (!data.WriteInt32(failCount)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteUint32(failCount)"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } MessageParcel reply; int32_t requestResult = SendRequest(IPrivacyManager::InterfaceCode::ADD_PERMISSION_USED_RECORD, data, reply); - if (!requestResult) { - ACCESSTOKEN_LOG_ERROR(LABEL, "add result fail, result: %{public}d", requestResult); + if (requestResult != NO_ERROR) { + return requestResult; } int32_t ret = reply.ReadInt32(); ACCESSTOKEN_LOG_DEBUG(LABEL, "get result from server data = %{public}d", ret); @@ -73,17 +74,17 @@ int32_t PrivacyManagerProxy::StartUsingPermission(AccessTokenID tokenID, const s data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); if (!data.WriteUint32(tokenID)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteUint32(%{public}d)", tokenID); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } if (!data.WriteString(permissionName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteString(permissionName)"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } MessageParcel reply; int32_t requestResult = SendRequest(IPrivacyManager::InterfaceCode::START_USING_PERMISSION, data, reply); - if (!requestResult) { - ACCESSTOKEN_LOG_ERROR(LABEL, "add result fail, result: %{public}d", requestResult); + if (requestResult != NO_ERROR) { + return requestResult; } int32_t ret = reply.ReadInt32(); ACCESSTOKEN_LOG_DEBUG(LABEL, "get result from server data = %{public}d", ret); @@ -96,17 +97,17 @@ int32_t PrivacyManagerProxy::StopUsingPermission(AccessTokenID tokenID, const st data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); if (!data.WriteUint32(tokenID)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteUint32(%{public}d)", tokenID); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } if (!data.WriteString(permissionName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteString(permissionName)"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } MessageParcel reply; int32_t requestResult = SendRequest(IPrivacyManager::InterfaceCode::STOP_USING_PERMISSION, data, reply); - if (!requestResult) { - ACCESSTOKEN_LOG_ERROR(LABEL, "add result fail, result: %{public}d", requestResult); + if (requestResult != NO_ERROR) { + return requestResult; } int32_t ret = reply.ReadInt32(); ACCESSTOKEN_LOG_DEBUG(LABEL, "get result from server data = %{public}d", ret); @@ -119,17 +120,17 @@ int32_t PrivacyManagerProxy::RemovePermissionUsedRecords(AccessTokenID tokenID, data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); if (!data.WriteUint32(tokenID)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteUint32(%{public}d)", tokenID); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } if (!data.WriteString(deviceID)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteString(deviceID)"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } MessageParcel reply; int32_t requestResult = SendRequest(IPrivacyManager::InterfaceCode::DELETE_PERMISSION_USED_RECORDS, data, reply); - if (!requestResult) { - ACCESSTOKEN_LOG_ERROR(LABEL, "add result fail, result: %{public}d", requestResult); + if (requestResult != NO_ERROR) { + return requestResult; } int32_t ret = reply.ReadInt32(); ACCESSTOKEN_LOG_DEBUG(LABEL, "get result from server data = %{public}d", ret); @@ -143,20 +144,19 @@ int32_t PrivacyManagerProxy::GetPermissionUsedRecords(const PermissionUsedReques data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); if (!data.WriteParcelable(&request)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteParcelable(request)"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } MessageParcel reply; int32_t requestResult = SendRequest(IPrivacyManager::InterfaceCode::GET_PERMISSION_USED_RECORDS, data, reply); - if (!requestResult) { - ACCESSTOKEN_LOG_ERROR(LABEL, "send request fail, result: %{public}d", requestResult); - return ERROR; + if (requestResult != NO_ERROR) { + return requestResult; } sptr resultSptr = reply.ReadParcelable(); if (resultSptr == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "ReadParcelable fail"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } result = *resultSptr; int32_t ret = reply.ReadInt32(); @@ -171,18 +171,17 @@ int32_t PrivacyManagerProxy::GetPermissionUsedRecords(const PermissionUsedReques data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); if (!data.WriteParcelable(&request)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteParcelable(request)"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } if (!data.WriteRemoteObject(callback->AsObject())) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteRemoteObject(callback)"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } MessageParcel reply; int32_t requestResult = SendRequest(IPrivacyManager::InterfaceCode::GET_PERMISSION_USED_RECORDS_ASYNC, data, reply); - if (!requestResult) { - ACCESSTOKEN_LOG_ERROR(LABEL, "send request fail, result: %{public}d", requestResult); - return ERROR; + if (requestResult != NO_ERROR) { + return requestResult; } int32_t ret = reply.ReadInt32(); ACCESSTOKEN_LOG_DEBUG(LABEL, "get result from server data = %{public}d", ret); @@ -196,44 +195,43 @@ int32_t PrivacyManagerProxy::RegisterPermActiveStatusCallback( MessageParcel data; if (!data.WriteInterfaceToken(IPrivacyManager::GetDescriptor())) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write WriteInterfaceToken."); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } uint32_t listSize = permList.size(); if (!data.WriteUint32(listSize)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write listSize"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } for (uint32_t i = 0; i < listSize; i++) { if (!data.WriteString(permList[i])) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write permList[%{public}d], %{public}s", i, permList[i].c_str()); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } } if (!data.WriteRemoteObject(callback)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write remote object."); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } MessageParcel reply; MessageOption option(MessageOption::TF_SYNC); sptr remote = Remote(); if (remote == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "remote service null."); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } int32_t requestResult = remote->SendRequest( static_cast(IPrivacyManager::InterfaceCode::REGISTER_PERM_ACTIVE_STATUS_CHANGE_CALLBACK), data, reply, option); if (requestResult != NO_ERROR) { - ACCESSTOKEN_LOG_ERROR(LABEL, "request fail, result: %{public}d.", requestResult); - return ERROR; + return requestResult; } int32_t result; if (!reply.ReadInt32(result)) { ACCESSTOKEN_LOG_ERROR(LABEL, "ReadInt32 fail"); - return ERROR; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } return result; } @@ -244,25 +242,24 @@ int32_t PrivacyManagerProxy::UnRegisterPermActiveStatusCallback(const sptr remote = Remote(); if (remote == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "remote service null."); - return ERROR; + return PrivacyError::ERR_SERVICE_ABNORMAL; } int32_t requestResult = remote->SendRequest( static_cast(IPrivacyManager::InterfaceCode::UNREGISTER_PERM_ACTIVE_STATUS_CHANGE_CALLBACK), data, reply, option); if (requestResult != NO_ERROR) { - ACCESSTOKEN_LOG_ERROR(LABEL, "request fail, result: %{public}d.", requestResult); - return ERROR; + return requestResult; } int32_t result; @@ -279,20 +276,19 @@ bool PrivacyManagerProxy::IsAllowedUsingPermission(AccessTokenID tokenID, const MessageParcel reply; if (!data.WriteInterfaceToken(IPrivacyManager::GetDescriptor())) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write WriteInterfaceToken."); - return false; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } if (!data.WriteUint32(tokenID)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteUint32(%{public}d)", tokenID); - return false; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } if (!data.WriteString(permissionName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to WriteString(%{public}s)", permissionName.c_str()); - return false; + return PrivacyError::ERR_IPC_PARCEL_FAILED; } - bool requestResult = SendRequest(IPrivacyManager::InterfaceCode::IS_ALLOWED_USING_PERMISSION, data, reply); - if (!requestResult) { - ACCESSTOKEN_LOG_ERROR(LABEL, "send request fail"); - return false; + int32_t requestResult = SendRequest(IPrivacyManager::InterfaceCode::IS_ALLOWED_USING_PERMISSION, data, reply); + if (requestResult != NO_ERROR) { + return requestResult; } bool result; if (!reply.ReadBool(result)) { @@ -302,22 +298,22 @@ bool PrivacyManagerProxy::IsAllowedUsingPermission(AccessTokenID tokenID, const return result; } -bool PrivacyManagerProxy::SendRequest( +int32_t PrivacyManagerProxy::SendRequest( IPrivacyManager::InterfaceCode code, MessageParcel& data, MessageParcel& reply) { MessageOption option(MessageOption::TF_SYNC); sptr remote = Remote(); if (remote == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "remote service null."); - return false; + return PrivacyError::ERR_SERVICE_ABNORMAL; } int32_t result = remote->SendRequest(static_cast(code), data, reply, option); if (result != NO_ERROR) { ACCESSTOKEN_LOG_ERROR(LABEL, "SendRequest fail, result: %{public}d", result); - return false; + return PrivacyError::ERR_SERVICE_ABNORMAL; } - return true; + return NO_ERROR; } } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.h b/interfaces/innerkits/privacy/src/privacy_manager_proxy.h index 65c55c7117a89e35b2f1bd756e8996f1234050f7..3c0e80bca98687b390bea3f103741b6b01d59cbf 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.h +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.h @@ -44,7 +44,7 @@ public: bool IsAllowedUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; private: - bool SendRequest(IPrivacyManager::InterfaceCode code, MessageParcel& data, MessageParcel& reply); + int32_t SendRequest(IPrivacyManager::InterfaceCode code, MessageParcel& data, MessageParcel& reply); static inline BrokerDelegator delegator_; }; } // namespace AccessToken diff --git a/services/privacymanager/src/service/privacy_manager_stub.cpp b/services/privacymanager/src/service/privacy_manager_stub.cpp index d3bda6b3bc2c63769d5455dc95c85dcad8340a7e..69465b739d248e961e7108e65ffd4894847d0389 100644 --- a/services/privacymanager/src/service/privacy_manager_stub.cpp +++ b/services/privacymanager/src/service/privacy_manager_stub.cpp @@ -78,7 +78,7 @@ int32_t PrivacyManagerStub::OnRemoteRequest( void PrivacyManagerStub::AddPermissionUsedRecordInner(MessageParcel& data, MessageParcel& reply) { if (!VerifyPermission(PERMISSION_USED_STATS)) { - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PERMISSION_DENIED); return; } AccessTokenID tokenId = data.ReadUint32(); @@ -92,7 +92,7 @@ void PrivacyManagerStub::AddPermissionUsedRecordInner(MessageParcel& data, Messa void PrivacyManagerStub::StartUsingPermissionInner(MessageParcel& data, MessageParcel& reply) { if (!VerifyPermission(PERMISSION_USED_STATS)) { - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PERMISSION_DENIED); return; } AccessTokenID tokenId = data.ReadUint32(); @@ -104,7 +104,7 @@ void PrivacyManagerStub::StartUsingPermissionInner(MessageParcel& data, MessageP void PrivacyManagerStub::StopUsingPermissionInner(MessageParcel& data, MessageParcel& reply) { if (!VerifyPermission(PERMISSION_USED_STATS)) { - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PERMISSION_DENIED); return; } AccessTokenID tokenId = data.ReadUint32(); @@ -116,7 +116,7 @@ void PrivacyManagerStub::StopUsingPermissionInner(MessageParcel& data, MessagePa void PrivacyManagerStub::RemovePermissionUsedRecordsInner(MessageParcel& data, MessageParcel& reply) { if (!IsAccessTokenCalling() && !VerifyPermission(PERMISSION_USED_STATS)) { - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PERMISSION_DENIED); return; } @@ -129,7 +129,7 @@ void PrivacyManagerStub::RemovePermissionUsedRecordsInner(MessageParcel& data, M void PrivacyManagerStub::GetPermissionUsedRecordsInner(MessageParcel& data, MessageParcel& reply) { if (!VerifyPermission(PERMISSION_USED_STATS)) { - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PERMISSION_DENIED); return; } PermissionUsedResultParcel responseParcel; @@ -137,7 +137,7 @@ void PrivacyManagerStub::GetPermissionUsedRecordsInner(MessageParcel& data, Mess if (requestParcel == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "ReadParcelable faild"); reply.WriteParcelable(&responseParcel); - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_IPC_PARCEL_FAILED); return; } int32_t result = this->GetPermissionUsedRecords(*requestParcel, responseParcel); @@ -148,13 +148,13 @@ void PrivacyManagerStub::GetPermissionUsedRecordsInner(MessageParcel& data, Mess void PrivacyManagerStub::GetPermissionUsedRecordsAsyncInner(MessageParcel& data, MessageParcel& reply) { if (!VerifyPermission(PERMISSION_USED_STATS)) { - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PERMISSION_DENIED); return; } sptr requestParcel = data.ReadParcelable(); if (requestParcel == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "ReadParcelable faild"); - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_IPC_PARCEL_FAILED); return; } sptr callback = iface_cast(data.ReadRemoteObject()); @@ -165,13 +165,13 @@ void PrivacyManagerStub::GetPermissionUsedRecordsAsyncInner(MessageParcel& data, void PrivacyManagerStub::RegisterPermActiveStatusCallbackInner(MessageParcel& data, MessageParcel& reply) { if (!VerifyPermission(PERMISSION_USED_STATS)) { - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PERMISSION_DENIED); return; } uint32_t permListSize = data.ReadUint32(); if (permListSize > PERM_LIST_SIZE_MAX) { ACCESSTOKEN_LOG_ERROR(LABEL, "read permListSize fail"); - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PARAM_INVALID); return; } std::vector permList; @@ -182,7 +182,7 @@ void PrivacyManagerStub::RegisterPermActiveStatusCallbackInner(MessageParcel& da sptr callback = data.ReadRemoteObject(); if (callback == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "read ReadRemoteObject fail"); - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_IPC_PARCEL_FAILED); return; } int32_t result = this->RegisterPermActiveStatusCallback(permList, callback); @@ -192,13 +192,13 @@ void PrivacyManagerStub::RegisterPermActiveStatusCallbackInner(MessageParcel& da void PrivacyManagerStub::UnRegisterPermActiveStatusCallbackInner(MessageParcel& data, MessageParcel& reply) { if (!VerifyPermission(PERMISSION_USED_STATS)) { - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PERMISSION_DENIED); return; } sptr callback = data.ReadRemoteObject(); if (callback == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "read scopeParcel fail"); - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_IPC_PARCEL_FAILED); return; } @@ -209,7 +209,7 @@ void PrivacyManagerStub::UnRegisterPermActiveStatusCallbackInner(MessageParcel& void PrivacyManagerStub::IsAllowedUsingPermissionInner(MessageParcel& data, MessageParcel& reply) { if (!VerifyPermission(PERMISSION_USED_STATS)) { - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(PrivacyError::ERR_PERMISSION_DENIED); return; } AccessTokenID tokenId = data.ReadUint32();