From 3238196d57ba743ee619e7cdae1d4b8983040f36 Mon Sep 17 00:00:00 2001 From: chennian Date: Wed, 22 Jun 2022 09:10:21 +0800 Subject: [PATCH 1/2] Signed-off-by:chennianchennian1@huawei.com Signed-off-by: chennian --- .../privacy/test/unittest/src/privacy_kit_test.cpp | 8 +++++++- services/privacymanager/src/database/data_translator.cpp | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp index 836f66420..882f270fc 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -371,7 +371,7 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords003, TestSize.Level1) /** * @tc.name: GetPermissionUsedRecords001 - * @tc.desc: cannot GetPermissionUsedRecords with invalid query time. + * @tc.desc: cannot GetPermissionUsedRecords with invalid query request. * @tc.type: FUNC * @tc.require:Issue Number */ @@ -389,6 +389,12 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords001, TestSize.Level1) request.beginTimeMillis = 3; request.endTimeMillis = 1; ASSERT_EQ(RET_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); + + request.flag = -1; + ASSERT_EQ(RET_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); + + request.flag = 3; + ASSERT_EQ(RET_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); } /** diff --git a/services/privacymanager/src/database/data_translator.cpp b/services/privacymanager/src/database/data_translator.cpp index 89e01e02d..59040594d 100644 --- a/services/privacymanager/src/database/data_translator.cpp +++ b/services/privacymanager/src/database/data_translator.cpp @@ -31,6 +31,10 @@ int32_t DataTranslator::TranslationIntoGenericValues(const PermissionUsedRequest return Constant::FAILURE; } + if (request.flag != FLAG_PERMISSION_USAGE_SUMMARY && request.flag != FLAG_PERMISSION_USAGE_DETAIL) { + return Constant::FAILURE; + } + if (begin == 0 && end == 0) { int64_t beginTime = TimeUtil::GetCurrentTimestamp() - Constant::LATEST_RECORD_TIME; begin = (beginTime < 0) ? 0 : beginTime; -- Gitee From a7fd9db447a1347171e723b81ec47ebe9decd2a6 Mon Sep 17 00:00:00 2001 From: chennian Date: Wed, 22 Jun 2022 11:04:24 +0800 Subject: [PATCH 2/2] Signed-off-by:chennianchennian1@huawei.com Signed-off-by: chennian --- .../privacy/test/unittest/src/privacy_kit_test.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp index 882f270fc..836f66420 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -371,7 +371,7 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords003, TestSize.Level1) /** * @tc.name: GetPermissionUsedRecords001 - * @tc.desc: cannot GetPermissionUsedRecords with invalid query request. + * @tc.desc: cannot GetPermissionUsedRecords with invalid query time. * @tc.type: FUNC * @tc.require:Issue Number */ @@ -389,12 +389,6 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords001, TestSize.Level1) request.beginTimeMillis = 3; request.endTimeMillis = 1; ASSERT_EQ(RET_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); - - request.flag = -1; - ASSERT_EQ(RET_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); - - request.flag = 3; - ASSERT_EQ(RET_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); } /** -- Gitee