diff --git a/frameworks/accesstoken/include/accesstoken_service_ipc_interface_code.h b/frameworks/accesstoken/include/accesstoken_service_ipc_interface_code.h index 07d0e107b261d2a3c78b13f9a124d622e8ffc1c1..1faa90993f672d0654b24438855a9e8fd02a0a3f 100644 --- a/frameworks/accesstoken/include/accesstoken_service_ipc_interface_code.h +++ b/frameworks/accesstoken/include/accesstoken_service_ipc_interface_code.h @@ -67,7 +67,6 @@ enum class AccessTokenInterfaceCode { DUMP_PERM_DEFINITION_INFO, GET_VERSION, GET_PERMISSION_MANAGER_INFO, - GET_NATIVE_TOKEN_NAME, INIT_USER_POLICY, UPDATE_USER_POLICY, CLEAR_USER_POLICY, diff --git a/frameworks/common/permission_definition_parser.py b/frameworks/common/permission_definition_parser.py index 014e65feaa5c8e2b8f4454f54436647add575ef3..129aff0288c0d7d59e368e5859a82f6d8a3847ae 100755 --- a/frameworks/common/permission_definition_parser.py +++ b/frameworks/common/permission_definition_parser.py @@ -85,6 +85,7 @@ JSON_VALUE_CONVERT_TO_CPP_DICT = { CONVERT_TARGET_PLATFORM = { "phone": "phone", "watch": "wearable", + "wearable": "wearable", "tablet": "tablet", "pc": "2in1", "tv": "tv", diff --git a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp index 9a12d0cc05629b33ad5f9c1377f5616998cc0d2c..3eecddd8759b81070cbc178f0a74919472bdb312 100644 --- a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp @@ -1432,7 +1432,6 @@ napi_value NapiAtManager::RegisterPermStateChangeCallback(napi_env env, napi_cal std::string errMsg = GetErrorMessage(JsErrorCode::JS_ERROR_PARAM_INVALID); NAPI_CALL(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_INVALID, errMsg))); } - return nullptr; } int32_t result; diff --git a/interfaces/inner_api/el5filekeymanager/include/el5_filekey_manager_kit.h b/interfaces/inner_api/el5filekeymanager/include/el5_filekey_manager_kit.h index 61b4077e5f90715aa3a236de08a81ae28595d286..eb833f97028e1550ce1ca7b5c4903769a4315759 100644 --- a/interfaces/inner_api/el5filekeymanager/include/el5_filekey_manager_kit.h +++ b/interfaces/inner_api/el5filekeymanager/include/el5_filekey_manager_kit.h @@ -85,7 +85,7 @@ public: */ static int32_t RegisterCallback(const sptr &callback); /** - * @brief Get key infos of the specified user. + * @brief Get all key infos of the specified user * @param userId The user id * @param keyInfos Key infos of the specified user id, as query result * @return error code, see el5_filekey_manager_error.h diff --git a/interfaces/innerkits/accesstoken/include/access_token_error.h b/interfaces/innerkits/accesstoken/include/access_token_error.h index 80c4b10f8ee45431579cba82415c936a2eabeccc..fd3076ec893b4dc419941e70be65211b1a7147f3 100644 --- a/interfaces/innerkits/accesstoken/include/access_token_error.h +++ b/interfaces/innerkits/accesstoken/include/access_token_error.h @@ -73,9 +73,9 @@ enum AccessTokenError { ERR_DATABASE_OPERATE_FAILED, ERR_SIZE_NOT_EQUAL, ERR_PERM_REQUEST_CFG_FAILED, - ERR_LOAD_SO_FAILED, ERR_USER_POLICY_INITIALIZED, ERR_USER_POLICY_NOT_INITIALIZED, + ERR_LOAD_SO_FAILED, ERR_REMOTE_CONNECTION, ERR_ADD_DEATH_RECIPIENT_FAILED, ERR_PRASE_RAW_DATA_FAILED, diff --git a/services/common/json_parse/src/json_parse_loader.cpp b/services/common/json_parse/src/json_parse_loader.cpp index 2998452afebe164c4e283b5d2c61a4cab90d3044..e237e8c8ff6df4158bb2519c1a31a3316366ba87 100644 --- a/services/common/json_parse/src/json_parse_loader.cpp +++ b/services/common/json_parse/src/json_parse_loader.cpp @@ -169,7 +169,7 @@ bool GetAtCfgFromJson(const CJson* j, AccessTokenServiceConfig& a) return false; } - if (!GetStringFromJson(j, GRANT_SERVICE_ABILITY_NAME_KEY, a.grantAbilityName)) { + if (!GetStringFromJson(j, GRANT_SERVICE_ABILITY_NAME_KEY, a.grantServiceAbilityName)) { return false; } diff --git a/services/privacymanager/include/service/privacy_manager_service.h b/services/privacymanager/include/service/privacy_manager_service.h index 9cd117d47f3d45741c2f5066643fba7b9799d534..bb17b1a4cba3550fa36de9d59a0609ddac884582 100644 --- a/services/privacymanager/include/service/privacy_manager_service.h +++ b/services/privacymanager/include/service/privacy_manager_service.h @@ -42,12 +42,12 @@ public: int32_t AddPermissionUsedRecord(const AddPermParamInfoParcel& infoParcel) override; int32_t AddPermissionUsedRecordAsync(const AddPermParamInfoParcel& infoParcel) override; - int32_t SetPermissionUsedRecordToggleStatus(int32_t userID, bool status) override; - int32_t GetPermissionUsedRecordToggleStatus(int32_t userID, bool& status) override; int32_t StartUsingPermission(const PermissionUsedTypeInfoParcel &infoParcel, const sptr& anonyStub) override; int32_t StartUsingPermissionCallback(const PermissionUsedTypeInfoParcel &infoParcel, const sptr& callback, const sptr& anonyStub) override; + int32_t SetPermissionUsedRecordToggleStatus(int32_t userID, bool status) override; + int32_t GetPermissionUsedRecordToggleStatus(int32_t userID, bool& status) override; int32_t StopUsingPermission(AccessTokenID tokenId, int32_t pid, const std::string& permissionName) override; int32_t RemovePermissionUsedRecords(AccessTokenID tokenId) override; int32_t GetPermissionUsedRecords( diff --git a/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp b/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp index 1cc14c11ed7ab02186081cdcda3cc3f795b66e2c..f6797bc939ffb3b62e2d0d7afaeeed4bcf8e5bb3 100644 --- a/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp +++ b/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp @@ -1179,6 +1179,7 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest001, TestSize.Leve { EXPECT_EQ(0, SetSelfTokenID(g_nativeToken)); + bool isMuteCamera = CameraManagerAdapter::GetInstance().IsCameraMuted(); // true means close PermissionRecordManager::GetInstance().SetMutePolicy(PolicyType::PRIVACY, CallerType::CAMERA, true, RANDOM_TOKENID); @@ -1194,6 +1195,8 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest001, TestSize.Leve sleep(3); // wait for dialog disappear ASSERT_EQ(0, PermissionRecordManager::GetInstance().StopUsingPermission( tokenId, PID, "ohos.permission.CAMERA", CALLER_PID)); + PermissionRecordManager::GetInstance().SetMutePolicy(PolicyType::PRIVACY, CallerType::CAMERA, isMuteCamera, + RANDOM_TOKENID); } /* diff --git a/services/privacymanager/test/unittest/permission_record_manager_test.cpp b/services/privacymanager/test/unittest/permission_record_manager_test.cpp index 132ae91ae1022f4e76466ffb55fc4a2e3c755ae3..9fadaf10bda71f2c4ec23b8e08e8245911f1a9c7 100644 --- a/services/privacymanager/test/unittest/permission_record_manager_test.cpp +++ b/services/privacymanager/test/unittest/permission_record_manager_test.cpp @@ -61,6 +61,7 @@ static AccessTokenID g_selfTokenId = 0; static AccessTokenID g_nativeToken = 0; static bool g_isMicEdmMute = false; static bool g_isMicMixMute = false; +static bool g_isMicMute = false; static constexpr int32_t TEST_USER_ID_10 = 10; static constexpr int32_t TEST_INVALID_USER_ID = -1; static constexpr int32_t TEST_INVALID_USER_ID_20000 = 20000; @@ -152,6 +153,7 @@ void PermissionRecordManagerTest::SetUpTestCase() g_isMicMixMute = PermissionRecordManager::GetInstance().isMicMixMute_; PermissionRecordManager::GetInstance().isMicEdmMute_ = false; PermissionRecordManager::GetInstance().isMicMixMute_ = false; + g_isMicMute = AudioManagerAdapter::GetInstance().GetPersistentMicMuteState(); } void PermissionRecordManagerTest::TearDownTestCase() @@ -184,6 +186,8 @@ void PermissionRecordManagerTest::SetUp() void PermissionRecordManagerTest::TearDown() { + PermissionRecordManager::GetInstance().SetMutePolicy(PolicyType::PRIVACY, CallerType::MICROPHONE, g_isMicMute, + RANDOM_TOKENID); AccessTokenIDEx tokenIdEx = PrivacyTestCommon::GetHapTokenIdFromBundle(g_InfoParms1.userID, g_InfoParms1.bundleName, g_InfoParms1.instIndex); PrivacyTestCommon::DeleteTestHapToken(tokenIdEx.tokenIdExStruct.tokenID); diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp index c89da2c5ec1e9bb5fd874a310462e6a452b229f5..82cf5470aab0610135c2d5b9b427c33dfce03e78 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp @@ -525,6 +525,8 @@ int SoftBusManager::FulfillLocalDeviceInfo() } std::string networkId = std::string(deviceInfo.networkId); + LOGD(ATM_DOMAIN, ATM_TAG, "Call softbus finished, type:%{public}d", deviceInfo.deviceTypeId); + std::string uuid; std::string udid;