From f59f58299e2d5f27c1382f2388582a51aa4dce32 Mon Sep 17 00:00:00 2001 From: chennian Date: Tue, 7 Jun 2022 20:16:36 +0800 Subject: [PATCH 1/2] Signed-off-by:chennian Signed-off-by: chennian --- frameworks/database/include/generic_values.h | 4 +-- frameworks/database/include/sqlite_helper.h | 16 ++++----- frameworks/database/include/statement.h | 24 ++++++------- frameworks/database/include/variant_value.h | 8 ++--- frameworks/database/src/generic_values.cpp | 4 +-- frameworks/database/src/sqlite_helper.cpp | 36 +++++++++---------- frameworks/database/src/statement.cpp | 32 ++++++++--------- frameworks/database/src/variant_value.cpp | 6 ++-- .../privacy/include/i_privacy_manager.h | 16 ++++----- .../privacy/src/bundle_used_record_parcel.cpp | 10 +++--- .../src/permission_used_record_parcel.cpp | 14 ++++---- .../src/permission_used_request_parcel.cpp | 12 ++++--- .../src/permission_used_result_parcel.cpp | 10 +++--- .../privacy/src/used_record_detail_parcel.cpp | 6 ++-- .../innerkits/privacy/include/privacy_kit.h | 14 ++++---- .../innerkits/privacy/src/privacy_kit.cpp | 14 ++++---- .../privacy/src/privacy_manager_client.cpp | 16 ++++----- .../privacy/src/privacy_manager_client.h | 14 ++++---- .../privacy/src/privacy_manager_proxy.cpp | 16 ++++----- .../privacy/src/privacy_manager_proxy.h | 14 ++++---- .../include/service/privacy_manager_service.h | 14 ++++---- .../include/service/privacy_manager_stub.h | 2 +- .../src/service/privacy_manager_service.cpp | 14 ++++---- .../src/service/privacy_manager_stub.cpp | 18 +++++----- 24 files changed, 172 insertions(+), 162 deletions(-) diff --git a/frameworks/database/include/generic_values.h b/frameworks/database/include/generic_values.h index 337e62659..beaf7384a 100644 --- a/frameworks/database/include/generic_values.h +++ b/frameworks/database/include/generic_values.h @@ -30,7 +30,7 @@ public: GenericValues() = default; virtual ~GenericValues() = default; - void Put(const std::string& key, int value); + void Put(const std::string& key, int32_t value); void Put(const std::string& key, int64_t value); @@ -42,7 +42,7 @@ public: VariantValue Get(const std::string& key) const; - int GetInt(const std::string& key) const; + int32_t GetInt(const std::string& key) const; int64_t GetInt64(const std::string& key) const; diff --git a/frameworks/database/include/sqlite_helper.h b/frameworks/database/include/sqlite_helper.h index 0f0979ab4..eec1f54f0 100644 --- a/frameworks/database/include/sqlite_helper.h +++ b/frameworks/database/include/sqlite_helper.h @@ -27,18 +27,18 @@ namespace Security { namespace AccessToken { class SqliteHelper { public: - explicit SqliteHelper(const std::string& dbName, const std::string& dbPath, int version); + explicit SqliteHelper(const std::string& dbName, const std::string& dbPath, int32_t version); virtual ~SqliteHelper(); void Open(); void Close(); - int BeginTransaction() const; - int CommitTransaction() const; - int RollbackTransaction() const; + int32_t BeginTransaction() const; + int32_t CommitTransaction() const; + int32_t RollbackTransaction() const; Statement Prepare(const std::string& sql) const; - int ExecuteSql(const std::string& sql) const; + int32_t ExecuteSql(const std::string& sql) const; std::string SpitError() const; virtual void OnCreate() = 0; @@ -46,14 +46,14 @@ public: private: inline static const std::string PRAGMA_VERSION_COMMAND = "PRAGMA user_version"; - static const int GENERAL_ERROR = -1; + static const int32_t GENERAL_ERROR = -1; const std::string dbName_; const std::string dbPath_; - int currentVersion_; + int32_t currentVersion_; sqlite3* db_; - int GetVersion() const; + int32_t GetVersion() const; void SetVersion() const; }; } // namespace AccessToken diff --git a/frameworks/database/include/statement.h b/frameworks/database/include/statement.h index 370ad8ca7..f2280cf0d 100644 --- a/frameworks/database/include/statement.h +++ b/frameworks/database/include/statement.h @@ -32,21 +32,21 @@ public: Statement(sqlite3* db, const std::string& sql); virtual ~Statement(); - void Bind(const int index, const std::string& text); - void Bind(const int index, int value); - void Bind(const int index, int64_t value); + void Bind(const int32_t index, const std::string& text); + void Bind(const int32_t index, int32_t value); + void Bind(const int32_t index, int64_t value); void Bind(const std::string& tableColumnName, const VariantValue& value); State Step(); - int Reset(); - - std::string GetColumnString(const int column) const; - int GetColumnInt(const int column) const; - int64_t GetColumnInt64(const int column) const; - std::string GetColumnName(const int column) const; - int GetParameterIndex(const std::string& name) const; - int GetColumnCount() const; - VariantValue GetValue(const int column, const bool flagInt64) const; + int32_t Reset(); + + std::string GetColumnString(const int32_t column) const; + int32_t GetColumnInt(const int32_t column) const; + int64_t GetColumnInt64(const int32_t column) const; + std::string GetColumnName(const int32_t column) const; + int32_t GetParameterIndex(const std::string& name) const; + int32_t GetColumnCount() const; + VariantValue GetValue(const int32_t column, const bool flagInt64) const; private: sqlite3* db_; diff --git a/frameworks/database/include/variant_value.h b/frameworks/database/include/variant_value.h index f5afced0a..aab2dba2f 100644 --- a/frameworks/database/include/variant_value.h +++ b/frameworks/database/include/variant_value.h @@ -34,20 +34,20 @@ public: VariantValue(); virtual ~VariantValue(); - explicit VariantValue(int value); + explicit VariantValue(int32_t value); explicit VariantValue(int64_t value); explicit VariantValue(const std::string& value); ValueType GetType() const; - int GetInt() const; + int32_t GetInt() const; int64_t GetInt64() const; std::string GetString() const; - static const int DEFAULT_VALUE = -1; + static const int32_t DEFAULT_VALUE = -1; private: ValueType type_; - std::variant value_; + std::variant value_; }; } // namespace AccessToken } // namespace Security diff --git a/frameworks/database/src/generic_values.cpp b/frameworks/database/src/generic_values.cpp index e40459836..c80ad00ae 100644 --- a/frameworks/database/src/generic_values.cpp +++ b/frameworks/database/src/generic_values.cpp @@ -18,7 +18,7 @@ namespace OHOS { namespace Security { namespace AccessToken { -void GenericValues::Put(const std::string& key, int value) +void GenericValues::Put(const std::string& key, int32_t value) { map_.insert(std::make_pair(key, VariantValue(value))); } @@ -47,7 +47,7 @@ VariantValue GenericValues::Get(const std::string& key) const return iter->second; } -int GenericValues::GetInt(const std::string& key) const +int32_t GenericValues::GetInt(const std::string& key) const { auto it = map_.find(key); if (it == map_.end()) { diff --git a/frameworks/database/src/sqlite_helper.cpp b/frameworks/database/src/sqlite_helper.cpp index 545bccd73..b3f36752c 100644 --- a/frameworks/database/src/sqlite_helper.cpp +++ b/frameworks/database/src/sqlite_helper.cpp @@ -27,7 +27,7 @@ namespace { static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "SqliteHelper"}; } -SqliteHelper::SqliteHelper(const std::string& dbName, const std::string& dbPath, int version) +SqliteHelper::SqliteHelper(const std::string& dbName, const std::string& dbPath, int32_t version) : dbName_(dbName), dbPath_(dbPath), currentVersion_(version), db_(nullptr) {} @@ -43,7 +43,7 @@ void SqliteHelper::Open() return; } std::string fileName = dbPath_ + dbName_; - int res = sqlite3_open(fileName.c_str(), &db_); + int32_t res = sqlite3_open(fileName.c_str(), &db_); if (res != SQLITE_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to open db: %{public}s", sqlite3_errmsg(db_)); return; @@ -53,7 +53,7 @@ void SqliteHelper::Open() Restorecon(fileName.c_str()); #endif // WITH_SELINUX - int version = GetVersion(); + int32_t version = GetVersion(); if (version == currentVersion_) { return; } @@ -76,7 +76,7 @@ void SqliteHelper::Close() ACCESSTOKEN_LOG_WARN(LABEL, "do open data base first!"); return; } - int ret = sqlite3_close(db_); + int32_t ret = sqlite3_close(db_); if (ret != SQLITE_OK) { ACCESSTOKEN_LOG_WARN(LABEL, "sqlite3_close error, ret=%{public}d", ret); return; @@ -84,15 +84,15 @@ void SqliteHelper::Close() db_ = nullptr; } -int SqliteHelper::BeginTransaction() const +int32_t SqliteHelper::BeginTransaction() const { if (db_ == nullptr) { ACCESSTOKEN_LOG_WARN(LABEL, "do open data base first!"); return GENERAL_ERROR; } char* errorMessage = nullptr; - int result = 0; - int ret = sqlite3_exec(db_, "BEGIN;", nullptr, nullptr, &errorMessage); + int32_t result = 0; + int32_t ret = sqlite3_exec(db_, "BEGIN;", nullptr, nullptr, &errorMessage); if (ret != SQLITE_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "failed, errorMsg: %{public}s", errorMessage); result = GENERAL_ERROR; @@ -101,15 +101,15 @@ int SqliteHelper::BeginTransaction() const return result; } -int SqliteHelper::CommitTransaction() const +int32_t SqliteHelper::CommitTransaction() const { if (db_ == nullptr) { ACCESSTOKEN_LOG_WARN(LABEL, "do open data base first!"); return GENERAL_ERROR; } char* errorMessage = nullptr; - int result = 0; - int ret = sqlite3_exec(db_, "COMMIT;", nullptr, nullptr, &errorMessage); + int32_t result = 0; + int32_t ret = sqlite3_exec(db_, "COMMIT;", nullptr, nullptr, &errorMessage); if (ret != SQLITE_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "failed, errorMsg: %{public}s", errorMessage); result = GENERAL_ERROR; @@ -118,15 +118,15 @@ int SqliteHelper::CommitTransaction() const return result; } -int SqliteHelper::RollbackTransaction() const +int32_t SqliteHelper::RollbackTransaction() const { if (db_ == nullptr) { ACCESSTOKEN_LOG_WARN(LABEL, "do open data base first!"); return GENERAL_ERROR; } - int result = 0; + int32_t result = 0; char* errorMessage = nullptr; - int ret = sqlite3_exec(db_, "ROLLBACK;", nullptr, nullptr, &errorMessage); + int32_t ret = sqlite3_exec(db_, "ROLLBACK;", nullptr, nullptr, &errorMessage); if (ret != SQLITE_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "failed, errorMsg: %{public}s", errorMessage); result = GENERAL_ERROR; @@ -140,15 +140,15 @@ Statement SqliteHelper::Prepare(const std::string& sql) const return Statement(db_, sql); } -int SqliteHelper::ExecuteSql(const std::string& sql) const +int32_t SqliteHelper::ExecuteSql(const std::string& sql) const { if (db_ == nullptr) { ACCESSTOKEN_LOG_WARN(LABEL, "do open data base first!"); return GENERAL_ERROR; } char* errorMessage = nullptr; - int result = 0; - int res = sqlite3_exec(db_, sql.c_str(), nullptr, nullptr, &errorMessage); + int32_t result = 0; + int32_t res = sqlite3_exec(db_, sql.c_str(), nullptr, nullptr, &errorMessage); if (res != SQLITE_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "failed, errorMsg: %{public}s", errorMessage); result = GENERAL_ERROR; @@ -157,14 +157,14 @@ int SqliteHelper::ExecuteSql(const std::string& sql) const return result; } -int SqliteHelper::GetVersion() const +int32_t SqliteHelper::GetVersion() const { if (db_ == nullptr) { ACCESSTOKEN_LOG_WARN(LABEL, "do open data base first!"); return GENERAL_ERROR; } auto statement = Prepare(PRAGMA_VERSION_COMMAND); - int version = 0; + int32_t version = 0; while (statement.Step() == Statement::State::ROW) { version = statement.GetColumnInt(0); } diff --git a/frameworks/database/src/statement.cpp b/frameworks/database/src/statement.cpp index f345ad7d3..7e33e1e06 100644 --- a/frameworks/database/src/statement.cpp +++ b/frameworks/database/src/statement.cpp @@ -37,50 +37,50 @@ Statement::~Statement() statement_ = nullptr; } -void Statement::Bind(const int index, const std::string& text) +void Statement::Bind(const int32_t index, const std::string& text) { if (sqlite3_bind_text(statement_, index, text.c_str(), text.size(), SQLITE_TRANSIENT) != SQLITE_OK) { ACCESSTOKEN_LOG_ERROR(LABEL, "Cannot bind string, errorMsg: %{public}s", sqlite3_errmsg(db_)); } } -void Statement::Bind(const int index, int value) +void Statement::Bind(const int32_t index, int32_t value) { if (sqlite3_bind_int(statement_, index, value) != SQLITE_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Cannot bind int, errorMsg: %{public}s", sqlite3_errmsg(db_)); + ACCESSTOKEN_LOG_ERROR(LABEL, "Cannot bind int32_t, errorMsg: %{public}s", sqlite3_errmsg(db_)); } } -void Statement::Bind(const int index, int64_t value) +void Statement::Bind(const int32_t index, int64_t value) { if (sqlite3_bind_int(statement_, index, value) != SQLITE_OK) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Cannot bind int, errorMsg: %{public}s", sqlite3_errmsg(db_)); + ACCESSTOKEN_LOG_ERROR(LABEL, "Cannot bind int32_t, errorMsg: %{public}s", sqlite3_errmsg(db_)); } } -int Statement::GetColumnInt(const int column) const +int32_t Statement::GetColumnInt(const int32_t column) const { return sqlite3_column_int(statement_, column); } -int64_t Statement::GetColumnInt64(const int column) const +int64_t Statement::GetColumnInt64(const int32_t column) const { return sqlite3_column_int64(statement_, column); } -std::string Statement::GetColumnString(const int column) const +std::string Statement::GetColumnString(const int32_t column) const { return std::string(reinterpret_cast(sqlite3_column_text(statement_, column))); } -std::string Statement::GetColumnName(const int column) const +std::string Statement::GetColumnName(const int32_t column) const { return sqlite3_column_name(statement_, column); } Statement::State Statement::Step() { - int ret = sqlite3_step(statement_); + int32_t ret = sqlite3_step(statement_); switch (ret) { case SQLITE_ROW: return Statement::State::ROW; @@ -95,14 +95,14 @@ Statement::State Statement::Step() } } -int Statement::GetParameterIndex(const std::string& name) const +int32_t Statement::GetParameterIndex(const std::string& name) const { return sqlite3_bind_parameter_index(statement_, name.c_str()); } void Statement::Bind(const std::string& tableColumnName, const VariantValue& value) { - int index = GetParameterIndex(":" + tableColumnName); + int32_t index = GetParameterIndex(":" + tableColumnName); if (value.GetType() == ValueType::TYPE_STRING) { Bind(index, value.GetString()); } else if (value.GetType() == ValueType::TYPE_INT) { @@ -112,19 +112,19 @@ void Statement::Bind(const std::string& tableColumnName, const VariantValue& val } } -int Statement::Reset() +int32_t Statement::Reset() { return sqlite3_reset(statement_); } -int Statement::GetColumnCount() const +int32_t Statement::GetColumnCount() const { return sqlite3_column_count(statement_); } -VariantValue Statement::GetValue(const int column, const bool flagInt64) const +VariantValue Statement::GetValue(const int32_t column, const bool flagInt64) const { - int type = sqlite3_column_type(statement_, column); + int32_t type = sqlite3_column_type(statement_, column); switch (type) { case SQLITE_INTEGER: if (flagInt64) { diff --git a/frameworks/database/src/variant_value.cpp b/frameworks/database/src/variant_value.cpp index 180254791..17f7a0a26 100644 --- a/frameworks/database/src/variant_value.cpp +++ b/frameworks/database/src/variant_value.cpp @@ -24,7 +24,7 @@ VariantValue::VariantValue() : type_(ValueType::TYPE_NULL) VariantValue::~VariantValue() {} -VariantValue::VariantValue(int value) : type_(ValueType::TYPE_INT) +VariantValue::VariantValue(int32_t value) : type_(ValueType::TYPE_INT) { value_ = value; } @@ -44,13 +44,13 @@ ValueType VariantValue::GetType() const return type_; } -int VariantValue::GetInt() const +int32_t VariantValue::GetInt() const { if (type_ != ValueType::TYPE_INT) { return DEFAULT_VALUE; } - return std::get(value_); + return std::get(value_); } int64_t VariantValue::GetInt64() const diff --git a/frameworks/privacy/include/i_privacy_manager.h b/frameworks/privacy/include/i_privacy_manager.h index 252801a17..dbd249111 100644 --- a/frameworks/privacy/include/i_privacy_manager.h +++ b/frameworks/privacy/include/i_privacy_manager.h @@ -31,18 +31,18 @@ namespace Security { namespace AccessToken { class IPrivacyManager : public IRemoteBroker { public: - static const int SA_ID_PRIVACY_MANAGER_SERVICE = 3505; + static const int32_t SA_ID_PRIVACY_MANAGER_SERVICE = 3505; DECLARE_INTERFACE_DESCRIPTOR(u"ohos.security.accesstoken.IPrivacyManager"); - virtual int AddPermissionUsedRecord( - AccessTokenID tokenID, const std::string& permissionName, int successCount, int failCount) = 0; - virtual int StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; - virtual int StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; - virtual int RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) = 0; - virtual int GetPermissionUsedRecords( + virtual int32_t AddPermissionUsedRecord( + AccessTokenID tokenID, const std::string& permissionName, int32_t successCount, int32_t failCount) = 0; + virtual int32_t StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; + virtual int32_t StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) = 0; + virtual int32_t RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) = 0; + virtual int32_t GetPermissionUsedRecords( const PermissionUsedRequestParcel& request, PermissionUsedResultParcel& result) = 0; - virtual int GetPermissionUsedRecords( + virtual int32_t GetPermissionUsedRecords( const PermissionUsedRequestParcel& request, const sptr& callback) = 0; virtual std::string DumpRecordInfo(const std::string& bundleName, const std::string& permissionName) = 0; diff --git a/frameworks/privacy/src/bundle_used_record_parcel.cpp b/frameworks/privacy/src/bundle_used_record_parcel.cpp index dfd4dbab0..6eae3df5c 100644 --- a/frameworks/privacy/src/bundle_used_record_parcel.cpp +++ b/frameworks/privacy/src/bundle_used_record_parcel.cpp @@ -26,8 +26,10 @@ namespace AccessToken { #define RELEASE_IF_FALSE(expr, obj) \ if (!(expr)) { \ - delete (obj); \ - (obj) = nullptr; \ + if ((obj) != nullptr) { \ + delete (obj); \ + (obj) = nullptr; \ + } \ return (obj); \ } @@ -57,9 +59,9 @@ BundleUsedRecordParcel* BundleUsedRecordParcel::Unmarshalling(Parcel& in) RELEASE_IF_FALSE(in.ReadString(bundleRecordParcel->bundleRecord.deviceId), bundleRecordParcel); RELEASE_IF_FALSE(in.ReadString(bundleRecordParcel->bundleRecord.bundleName), bundleRecordParcel); - int permRecordSize = 0; + int32_t permRecordSize = 0; RELEASE_IF_FALSE(in.ReadInt32(permRecordSize), bundleRecordParcel); - for (int i = 0; i < permRecordSize; i++) { + for (int32_t i = 0; i < permRecordSize; i++) { sptr permRecord = in.ReadParcelable(); RELEASE_IF_FALSE(permRecord != nullptr, bundleRecordParcel); bundleRecordParcel->bundleRecord.permissionRecords.emplace_back(permRecord->permissionRecord); diff --git a/frameworks/privacy/src/permission_used_record_parcel.cpp b/frameworks/privacy/src/permission_used_record_parcel.cpp index a547d4b96..657babba6 100644 --- a/frameworks/privacy/src/permission_used_record_parcel.cpp +++ b/frameworks/privacy/src/permission_used_record_parcel.cpp @@ -26,8 +26,10 @@ namespace AccessToken { #define RELEASE_IF_FALSE(expr, obj) \ if (!(expr)) { \ - delete (obj); \ - (obj) = nullptr; \ + if ((obj) != nullptr) { \ + delete (obj); \ + (obj) = nullptr; \ + } \ return (obj); \ } @@ -68,17 +70,17 @@ PermissionUsedRecordParcel* PermissionUsedRecordParcel::Unmarshalling(Parcel& in RELEASE_IF_FALSE(in.ReadInt64(permissionRecordParcel->permissionRecord.lastRejectTime), permissionRecordParcel); RELEASE_IF_FALSE(in.ReadInt64(permissionRecordParcel->permissionRecord.lastAccessDuration), permissionRecordParcel); - int accRecordSize = 0; + int32_t accRecordSize = 0; RELEASE_IF_FALSE(in.ReadInt32(accRecordSize), permissionRecordParcel); - for (int i = 0; i < accRecordSize; i++) { + for (int32_t i = 0; i < accRecordSize; i++) { sptr detailParcel = in.ReadParcelable(); RELEASE_IF_FALSE(detailParcel != nullptr, permissionRecordParcel); permissionRecordParcel->permissionRecord.accessRecords.emplace_back(detailParcel->detail); } - int rejRecordSize = 0; + int32_t rejRecordSize = 0; RELEASE_IF_FALSE(in.ReadInt32(rejRecordSize), permissionRecordParcel); - for (int i = 0; i < rejRecordSize; i++) { + for (int32_t i = 0; i < rejRecordSize; i++) { sptr detailParcel = in.ReadParcelable(); RELEASE_IF_FALSE(detailParcel != nullptr, permissionRecordParcel); permissionRecordParcel->permissionRecord.rejectRecords.emplace_back(detailParcel->detail); diff --git a/frameworks/privacy/src/permission_used_request_parcel.cpp b/frameworks/privacy/src/permission_used_request_parcel.cpp index 28c6a7377..dfc841530 100644 --- a/frameworks/privacy/src/permission_used_request_parcel.cpp +++ b/frameworks/privacy/src/permission_used_request_parcel.cpp @@ -25,8 +25,10 @@ namespace AccessToken { #define RELEASE_IF_FALSE(expr, obj) \ if (!(expr)) { \ - delete (obj); \ - (obj) = nullptr; \ + if ((obj) != nullptr) { \ + delete (obj); \ + (obj) = nullptr; \ + } \ return (obj); \ } @@ -57,16 +59,16 @@ PermissionUsedRequestParcel* PermissionUsedRequestParcel::Unmarshalling(Parcel& RELEASE_IF_FALSE(in.ReadString(requestParcel->request.deviceId), requestParcel); RELEASE_IF_FALSE(in.ReadString(requestParcel->request.bundleName), requestParcel); - int permSize = 0; + int32_t permSize = 0; RELEASE_IF_FALSE(in.ReadInt32(permSize), requestParcel); - for (int i = 0; i < permSize; i++) { + for (int32_t i = 0; i < permSize; i++) { std::string perm; RELEASE_IF_FALSE(in.ReadString(perm), requestParcel); requestParcel->request.permissionList.emplace_back(perm); } RELEASE_IF_FALSE(in.ReadInt64(requestParcel->request.beginTimeMillis), requestParcel); RELEASE_IF_FALSE(in.ReadInt64(requestParcel->request.endTimeMillis), requestParcel); - int flag; + int32_t flag; RELEASE_IF_FALSE(in.ReadInt32(flag), requestParcel); requestParcel->request.flag = static_cast(flag); return requestParcel; diff --git a/frameworks/privacy/src/permission_used_result_parcel.cpp b/frameworks/privacy/src/permission_used_result_parcel.cpp index ff3a2e1b0..a8655ff69 100644 --- a/frameworks/privacy/src/permission_used_result_parcel.cpp +++ b/frameworks/privacy/src/permission_used_result_parcel.cpp @@ -26,8 +26,10 @@ namespace AccessToken { #define RELEASE_IF_FALSE(expr, obj) \ if (!(expr)) { \ - delete (obj); \ - (obj) = nullptr; \ + if ((obj) != nullptr) { \ + delete (obj); \ + (obj) = nullptr; \ + } \ return (obj); \ } @@ -53,9 +55,9 @@ PermissionUsedResultParcel* PermissionUsedResultParcel::Unmarshalling(Parcel& in RELEASE_IF_FALSE(in.ReadInt64(resultParcel->result.beginTimeMillis), resultParcel); RELEASE_IF_FALSE(in.ReadInt64(resultParcel->result.endTimeMillis), resultParcel); - int bundResponseSize = 0; + int32_t bundResponseSize = 0; RELEASE_IF_FALSE(in.ReadInt32(bundResponseSize), resultParcel); - for (int i = 0; i < bundResponseSize; i++) { + for (int32_t i = 0; i < bundResponseSize; i++) { sptr bunRecordParcel = in.ReadParcelable(); RELEASE_IF_FALSE(bunRecordParcel != nullptr, resultParcel); resultParcel->result.bundleRecords.emplace_back(bunRecordParcel->bundleRecord); diff --git a/frameworks/privacy/src/used_record_detail_parcel.cpp b/frameworks/privacy/src/used_record_detail_parcel.cpp index 50d6f5bbb..d8ffc2927 100644 --- a/frameworks/privacy/src/used_record_detail_parcel.cpp +++ b/frameworks/privacy/src/used_record_detail_parcel.cpp @@ -25,8 +25,10 @@ namespace AccessToken { #define RELEASE_IF_FALSE(expr, obj) \ if (!(expr)) { \ - delete (obj); \ - (obj) = nullptr; \ + if ((obj) != nullptr) { \ + delete (obj); \ + (obj) = nullptr; \ + } \ return (obj); \ } diff --git a/interfaces/innerkits/privacy/include/privacy_kit.h b/interfaces/innerkits/privacy/include/privacy_kit.h index 7ce90440b..d46a6351b 100644 --- a/interfaces/innerkits/privacy/include/privacy_kit.h +++ b/interfaces/innerkits/privacy/include/privacy_kit.h @@ -28,13 +28,13 @@ namespace Security { namespace AccessToken { class PrivacyKit { public: - static int AddPermissionUsedRecord( - AccessTokenID tokenID, const std::string& permissionName, int successCount, int failCount); - static int StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName); - static int StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName); - static int RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID); - static int GetPermissionUsedRecords(const PermissionUsedRequest& request, PermissionUsedResult& result); - static int GetPermissionUsedRecords( + static int32_t AddPermissionUsedRecord( + AccessTokenID tokenID, const std::string& permissionName, int32_t successCount, int32_t failCount); + static int32_t StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName); + static int32_t StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName); + static int32_t RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID); + static int32_t GetPermissionUsedRecords(const PermissionUsedRequest& request, PermissionUsedResult& result); + static int32_t GetPermissionUsedRecords( const PermissionUsedRequest& request, const sptr& callback); static std::string DumpRecordInfo(const std::string& bundleName, const std::string& permissionName); }; diff --git a/interfaces/innerkits/privacy/src/privacy_kit.cpp b/interfaces/innerkits/privacy/src/privacy_kit.cpp index 0e1588871..39d3eb036 100644 --- a/interfaces/innerkits/privacy/src/privacy_kit.cpp +++ b/interfaces/innerkits/privacy/src/privacy_kit.cpp @@ -28,8 +28,8 @@ namespace { static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_PRIVACY, "PrivacyKit"}; } // namespace -int PrivacyKit::AddPermissionUsedRecord( - AccessTokenID tokenID, const std::string& permissionName, int successCount, int failCount) +int32_t PrivacyKit::AddPermissionUsedRecord( + AccessTokenID tokenID, const std::string& permissionName, int32_t successCount, int32_t failCount) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called, tokenID=0x%{public}x, permissionName=%{public}s,", __func__, tokenID, permissionName.c_str()); @@ -37,33 +37,33 @@ int PrivacyKit::AddPermissionUsedRecord( tokenID, permissionName, successCount, failCount); } -int PrivacyKit::StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) +int32_t PrivacyKit::StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called, tokenID=0x%{public}x, permissionName=%{public}s", __func__, tokenID, permissionName.c_str()); return PrivacyManagerClient::GetInstance().StartUsingPermission(tokenID, permissionName); } -int PrivacyKit::StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) +int32_t PrivacyKit::StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called, tokenID=0x%{public}x, permissionName=%{public}s", __func__, tokenID, permissionName.c_str()); return PrivacyManagerClient::GetInstance().StopUsingPermission(tokenID, permissionName); } -int PrivacyKit::RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) +int32_t PrivacyKit::RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called", __func__); return PrivacyManagerClient::GetInstance().RemovePermissionUsedRecords(tokenID, deviceID); } -int PrivacyKit::GetPermissionUsedRecords(const PermissionUsedRequest& request, PermissionUsedResult& result) +int32_t PrivacyKit::GetPermissionUsedRecords(const PermissionUsedRequest& request, PermissionUsedResult& result) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called", __func__); return PrivacyManagerClient::GetInstance().GetPermissionUsedRecords(request, result); } -int PrivacyKit::GetPermissionUsedRecords( +int32_t PrivacyKit::GetPermissionUsedRecords( const PermissionUsedRequest& request, const sptr& callback) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called", __func__); diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp index 32a583d43..7ba560905 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp @@ -42,8 +42,8 @@ PrivacyManagerClient::PrivacyManagerClient() PrivacyManagerClient::~PrivacyManagerClient() {} -int PrivacyManagerClient::AddPermissionUsedRecord( - AccessTokenID tokenID, const std::string& permissionName, int successCount, int failCount) +int32_t PrivacyManagerClient::AddPermissionUsedRecord( + AccessTokenID tokenID, const std::string& permissionName, int32_t successCount, int32_t failCount) { if (!DataValidator::IsTokenIDValid(tokenID) || !DataValidator::IsPermissionNameValid(permissionName) || (successCount < 0 || failCount < 0)) { @@ -58,7 +58,7 @@ int PrivacyManagerClient::AddPermissionUsedRecord( return proxy->AddPermissionUsedRecord(tokenID, permissionName, successCount, failCount); } -int PrivacyManagerClient::StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) +int32_t PrivacyManagerClient::StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) { if (!DataValidator::IsTokenIDValid(tokenID) || !DataValidator::IsPermissionNameValid(permissionName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "parameter is invalid"); @@ -72,7 +72,7 @@ int PrivacyManagerClient::StartUsingPermission(AccessTokenID tokenID, const std: return proxy->StartUsingPermission(tokenID, permissionName); } -int PrivacyManagerClient::StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) +int32_t PrivacyManagerClient::StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) { if (!DataValidator::IsTokenIDValid(tokenID) || !DataValidator::IsPermissionNameValid(permissionName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "parameter is invalid"); @@ -86,7 +86,7 @@ int PrivacyManagerClient::StopUsingPermission(AccessTokenID tokenID, const std:: return proxy->StopUsingPermission(tokenID, permissionName); } -int PrivacyManagerClient::RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) +int32_t PrivacyManagerClient::RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) { if (!DataValidator::IsTokenIDValid(tokenID) && !DataValidator::IsDeviceIdValid(deviceID)) { ACCESSTOKEN_LOG_ERROR(LABEL, "parameter is invalid"); @@ -100,7 +100,7 @@ int PrivacyManagerClient::RemovePermissionUsedRecords(AccessTokenID tokenID, con return proxy->RemovePermissionUsedRecords(tokenID, deviceID); } -int PrivacyManagerClient::GetPermissionUsedRecords(const PermissionUsedRequest& request, PermissionUsedResult& result) +int32_t PrivacyManagerClient::GetPermissionUsedRecords(const PermissionUsedRequest& request, PermissionUsedResult& result) { auto proxy = GetProxy(); if (proxy == nullptr) { @@ -111,12 +111,12 @@ int PrivacyManagerClient::GetPermissionUsedRecords(const PermissionUsedRequest& PermissionUsedRequestParcel requestParcel; PermissionUsedResultParcel reultParcel; requestParcel.request = request; - int ret = proxy->GetPermissionUsedRecords(requestParcel, reultParcel); + int32_t ret = proxy->GetPermissionUsedRecords(requestParcel, reultParcel); result = reultParcel.result; return ret; } -int PrivacyManagerClient::GetPermissionUsedRecords(const PermissionUsedRequest& request, +int32_t PrivacyManagerClient::GetPermissionUsedRecords(const PermissionUsedRequest& request, const sptr& callback) { auto proxy = GetProxy(); diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.h b/interfaces/innerkits/privacy/src/privacy_manager_client.h index e882d4c98..9c838bc9b 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.h +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.h @@ -32,13 +32,13 @@ public: virtual ~PrivacyManagerClient(); - int AddPermissionUsedRecord( - AccessTokenID tokenID, const std::string& permissionName, int successCount, int failCount); - int StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName); - int StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName); - int RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID); - int GetPermissionUsedRecords(const PermissionUsedRequest& request, PermissionUsedResult& result); - int GetPermissionUsedRecords( + int32_t AddPermissionUsedRecord( + AccessTokenID tokenID, const std::string& permissionName, int32_t successCount, int32_t failCount); + int32_t StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName); + int32_t StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName); + int32_t RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID); + int32_t GetPermissionUsedRecords(const PermissionUsedRequest& request, PermissionUsedResult& result); + int32_t GetPermissionUsedRecords( const PermissionUsedRequest& request, const sptr& callback); std::string DumpRecordInfo(const std::string& bundleName, const std::string& permissionName); diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp index 46164ff4b..214d467e5 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.cpp @@ -35,8 +35,8 @@ PrivacyManagerProxy::PrivacyManagerProxy(const sptr& impl) PrivacyManagerProxy::~PrivacyManagerProxy() {} -int PrivacyManagerProxy::AddPermissionUsedRecord(AccessTokenID tokenID, const std::string& permissionName, - int successCount, int failCount) +int32_t PrivacyManagerProxy::AddPermissionUsedRecord(AccessTokenID tokenID, const std::string& permissionName, + int32_t successCount, int32_t failCount) { MessageParcel data; data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); @@ -67,7 +67,7 @@ int PrivacyManagerProxy::AddPermissionUsedRecord(AccessTokenID tokenID, const st return ret; } -int PrivacyManagerProxy::StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) +int32_t PrivacyManagerProxy::StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) { MessageParcel data; data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); @@ -90,7 +90,7 @@ int PrivacyManagerProxy::StartUsingPermission(AccessTokenID tokenID, const std:: return ret; } -int PrivacyManagerProxy::StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) +int32_t PrivacyManagerProxy::StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) { MessageParcel data; data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); @@ -108,12 +108,12 @@ int PrivacyManagerProxy::StopUsingPermission(AccessTokenID tokenID, const std::s if (!requestResult) { ACCESSTOKEN_LOG_ERROR(LABEL, "add result fail, result: %{public}d", requestResult); } - int ret = reply.ReadInt32(); + int32_t ret = reply.ReadInt32(); ACCESSTOKEN_LOG_DEBUG(LABEL, "get result from server data = %{public}d", ret); return ret; } -int PrivacyManagerProxy::RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) +int32_t PrivacyManagerProxy::RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) { MessageParcel data; data.WriteInterfaceToken(IPrivacyManager::GetDescriptor()); @@ -136,7 +136,7 @@ int PrivacyManagerProxy::RemovePermissionUsedRecords(AccessTokenID tokenID, cons return ret; } -int PrivacyManagerProxy::GetPermissionUsedRecords(const PermissionUsedRequestParcel& request, +int32_t PrivacyManagerProxy::GetPermissionUsedRecords(const PermissionUsedRequestParcel& request, PermissionUsedResultParcel& result) { MessageParcel data; @@ -164,7 +164,7 @@ int PrivacyManagerProxy::GetPermissionUsedRecords(const PermissionUsedRequestPar return ret; } -int PrivacyManagerProxy::GetPermissionUsedRecords(const PermissionUsedRequestParcel& request, +int32_t PrivacyManagerProxy::GetPermissionUsedRecords(const PermissionUsedRequestParcel& request, const sptr& callback) { MessageParcel data; diff --git a/interfaces/innerkits/privacy/src/privacy_manager_proxy.h b/interfaces/innerkits/privacy/src/privacy_manager_proxy.h index fa68f173a..1f5e8c869 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_proxy.h +++ b/interfaces/innerkits/privacy/src/privacy_manager_proxy.h @@ -29,14 +29,14 @@ public: explicit PrivacyManagerProxy(const sptr& impl); ~PrivacyManagerProxy() override; - int AddPermissionUsedRecord( - AccessTokenID tokenID, const std::string& permissionName, int successCount, int failCount) override; - int StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; - int StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; - int RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) override; - int GetPermissionUsedRecords( + int32_t AddPermissionUsedRecord( + AccessTokenID tokenID, const std::string& permissionName, int32_t successCount, int32_t failCount) override; + int32_t StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; + int32_t StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; + int32_t RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) override; + int32_t GetPermissionUsedRecords( const PermissionUsedRequestParcel& request, PermissionUsedResultParcel& result) override; - int GetPermissionUsedRecords(const PermissionUsedRequestParcel& request, + int32_t GetPermissionUsedRecords(const PermissionUsedRequestParcel& request, const sptr& callback) override; std::string DumpRecordInfo(const std::string& bundleName, const std::string& permissionName) override; diff --git a/services/privacymanager/include/service/privacy_manager_service.h b/services/privacymanager/include/service/privacy_manager_service.h index 597f1d727..7cf0ab246 100644 --- a/services/privacymanager/include/service/privacy_manager_service.h +++ b/services/privacymanager/include/service/privacy_manager_service.h @@ -36,14 +36,14 @@ public: void OnStart() override; void OnStop() override; - int AddPermissionUsedRecord( - AccessTokenID tokenID, const std::string& permissionName, int successCount, int failCount) override; - int StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; - int StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; - int RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) override; - int GetPermissionUsedRecords( + int32_t AddPermissionUsedRecord( + AccessTokenID tokenID, const std::string& permissionName, int32_t successCount, int32_t failCount) override; + int32_t StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; + int32_t StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) override; + int32_t RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) override; + int32_t GetPermissionUsedRecords( const PermissionUsedRequestParcel& request, PermissionUsedResultParcel& result) override; - int GetPermissionUsedRecords( + int32_t GetPermissionUsedRecords( const PermissionUsedRequestParcel& request, const sptr& callback) override; std::string DumpRecordInfo(const std::string& bundleName, const std::string& permissionName) override; diff --git a/services/privacymanager/include/service/privacy_manager_stub.h b/services/privacymanager/include/service/privacy_manager_stub.h index 14f0a54b6..899b8dcde 100644 --- a/services/privacymanager/include/service/privacy_manager_stub.h +++ b/services/privacymanager/include/service/privacy_manager_stub.h @@ -29,7 +29,7 @@ public: PrivacyManagerStub() = default; virtual ~PrivacyManagerStub() = default; - int OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) override; + int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) override; private: diff --git a/services/privacymanager/src/service/privacy_manager_service.cpp b/services/privacymanager/src/service/privacy_manager_service.cpp index ca9390385..55811491e 100644 --- a/services/privacymanager/src/service/privacy_manager_service.cpp +++ b/services/privacymanager/src/service/privacy_manager_service.cpp @@ -68,35 +68,35 @@ void PrivacyManagerService::OnStop() state_ = ServiceRunningState::STATE_NOT_START; } -int PrivacyManagerService::AddPermissionUsedRecord( - AccessTokenID tokenID, const std::string& permissionName, int successCount, int failCount) +int32_t PrivacyManagerService::AddPermissionUsedRecord( + AccessTokenID tokenID, const std::string& permissionName, int32_t successCount, int32_t failCount) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called, tokenID: 0x%{public}x, permission: %{public}s", __func__, tokenID, permissionName.c_str()); return Constant::SUCCESS; } -int PrivacyManagerService::StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) +int32_t PrivacyManagerService::StartUsingPermission(AccessTokenID tokenID, const std::string& permissionName) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called, tokenID: 0x%{public}x, permission: %{public}s", __func__, tokenID, permissionName.c_str()); return Constant::SUCCESS; } -int PrivacyManagerService::StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) +int32_t PrivacyManagerService::StopUsingPermission(AccessTokenID tokenID, const std::string& permissionName) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called, tokenID: 0x%{public}x, permission: %{public}s", __func__, tokenID, permissionName.c_str()); return Constant::SUCCESS; } -int PrivacyManagerService::RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) +int32_t PrivacyManagerService::RemovePermissionUsedRecords(AccessTokenID tokenID, const std::string& deviceID) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called", __func__); return Constant::SUCCESS; } -int PrivacyManagerService::GetPermissionUsedRecords( +int32_t PrivacyManagerService::GetPermissionUsedRecords( const PermissionUsedRequestParcel& request, PermissionUsedResultParcel& result) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called", __func__); @@ -104,7 +104,7 @@ int PrivacyManagerService::GetPermissionUsedRecords( return Constant::SUCCESS; } -int PrivacyManagerService::GetPermissionUsedRecords( +int32_t PrivacyManagerService::GetPermissionUsedRecords( const PermissionUsedRequestParcel& request, const sptr& callback) { ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s called", __func__); diff --git a/services/privacymanager/src/service/privacy_manager_stub.cpp b/services/privacymanager/src/service/privacy_manager_stub.cpp index 56cd0e8e1..5a078274d 100644 --- a/services/privacymanager/src/service/privacy_manager_stub.cpp +++ b/services/privacymanager/src/service/privacy_manager_stub.cpp @@ -29,7 +29,7 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { }; } -int PrivacyManagerStub::OnRemoteRequest( +int32_t PrivacyManagerStub::OnRemoteRequest( uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { std::u16string descriptor = data.ReadInterfaceToken(); @@ -69,9 +69,9 @@ void PrivacyManagerStub::AddPermissionUsedRecordInner(MessageParcel& data, Messa { AccessTokenID tokenID = data.ReadUint32(); std::string permissionName = data.ReadString(); - int successCount = data.ReadInt32(); - int failCount = data.ReadInt32(); - int result = this->AddPermissionUsedRecord(tokenID, permissionName, successCount, failCount); + int32_t successCount = data.ReadInt32(); + int32_t failCount = data.ReadInt32(); + int32_t result = this->AddPermissionUsedRecord(tokenID, permissionName, successCount, failCount); reply.WriteInt32(result); } @@ -79,7 +79,7 @@ void PrivacyManagerStub::StartUsingPermissionInner(MessageParcel& data, MessageP { AccessTokenID tokenID = data.ReadUint32(); std::string permissionName = data.ReadString(); - int result = this->StartUsingPermission(tokenID, permissionName); + int32_t result = this->StartUsingPermission(tokenID, permissionName); reply.WriteInt32(result); } @@ -87,7 +87,7 @@ void PrivacyManagerStub::StopUsingPermissionInner(MessageParcel& data, MessagePa { AccessTokenID tokenID = data.ReadUint32(); std::string permissionName = data.ReadString(); - int result = this->StopUsingPermission(tokenID, permissionName); + int32_t result = this->StopUsingPermission(tokenID, permissionName); reply.WriteInt32(result); } @@ -95,7 +95,7 @@ void PrivacyManagerStub::RemovePermissionUsedRecordsInner(MessageParcel& data, M { AccessTokenID tokenID = data.ReadUint32(); std::string deviceID = data.ReadString(); - int result = this->RemovePermissionUsedRecords(tokenID, deviceID); + int32_t result = this->RemovePermissionUsedRecords(tokenID, deviceID); reply.WriteInt32(result); } @@ -108,7 +108,7 @@ void PrivacyManagerStub::GetPermissionUsedRecordsInner(MessageParcel& data, Mess return; } PermissionUsedResultParcel responseParcel; - int result = this->GetPermissionUsedRecords(*requestParcel, responseParcel); + int32_t result = this->GetPermissionUsedRecords(*requestParcel, responseParcel); reply.WriteParcelable(&responseParcel); reply.WriteInt32(result); } @@ -122,7 +122,7 @@ void PrivacyManagerStub::GetPermissionUsedRecordsAsyncInner(MessageParcel& data, return; } sptr callback = iface_cast(data.ReadRemoteObject()); - int result = this->GetPermissionUsedRecords(*requestParcel, callback); + int32_t result = this->GetPermissionUsedRecords(*requestParcel, callback); reply.WriteInt32(result); } -- Gitee From cf383f22dcd851eae8eb34f96ebc2e9c59e526ec Mon Sep 17 00:00:00 2001 From: chennian Date: Tue, 7 Jun 2022 20:23:45 +0800 Subject: [PATCH 2/2] Signed-off-by:chennian Signed-off-by: chennian --- interfaces/innerkits/privacy/src/privacy_manager_client.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp index 7ba560905..306b01786 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp @@ -100,7 +100,8 @@ int32_t PrivacyManagerClient::RemovePermissionUsedRecords(AccessTokenID tokenID, return proxy->RemovePermissionUsedRecords(tokenID, deviceID); } -int32_t PrivacyManagerClient::GetPermissionUsedRecords(const PermissionUsedRequest& request, PermissionUsedResult& result) +int32_t PrivacyManagerClient::GetPermissionUsedRecords( + const PermissionUsedRequest& request, PermissionUsedResult& result) { auto proxy = GetProxy(); if (proxy == nullptr) { -- Gitee