diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 48c015e73f110cfc605d56be27e5aefabb85c2e5..5180091b0ee0883f6c6b8d63e9c8ff6dcd8ffe61 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -1055,10 +1055,10 @@ typedef enum control_moving_photo_enum { } control_moving_photo_enum_t; // OHOS_STATUS_FLASH_SUGGESTION enumeration values -typedef enum camera_flash_suggestion_supported_enum { +typedef enum camera_flash_suggestion_surported_enum { OHOS_CAMERA_FLASH_SUGGESTION_SUPPORTED_CLOSE = 0, OHOS_CAMERA_FLASH_SUGGESTION_SUPPORTED_OPEN, -} camera_flash_suggestion_supported_enum_t; +} camera_flash_suggestion_surported_enum_t; // ABILITY_SUPPORTED_TAGS enumeration values typedef enum camera_supported_enum { diff --git a/user_auth/v2_0/IUserAuthInterface.idl b/user_auth/v2_0/IUserAuthInterface.idl index c60fd9b26a7dc0189974a414922012d56b4d1403..817a1e4fdd94e83d8284ceb4ed2f50383b75c1fb 100644 --- a/user_auth/v2_0/IUserAuthInterface.idl +++ b/user_auth/v2_0/IUserAuthInterface.idl @@ -268,11 +268,12 @@ interface IUserAuthInterface { */ CancelIdentification([in] unsigned long contextId); /** - * @brief Obtains the trust level of the current authentication type. + * @brief Check whether the authentication capability is avaliable. * * @param userId Indicates the user ID. * @param authType Indicates the authentication type. See {@link AuthType}. * @param authTrustLevel Indicates the authentication trust level. + * @param checkResult Indicates check result. * * @return Returns 0 if the operation is successful. * @return Returns a non-zero value if the operation fails. @@ -280,7 +281,7 @@ interface IUserAuthInterface { * @since 3.2 * @version 2.0 */ - GetAuthTrustLevel([in] int userId, [in] int authType, [out] unsigned int authTrustLevel); + GetAvailableStatus([in] int userId, [in] int authType, [in] unsigned int authTrustLevel, [out] int checkResult); /** * @brief Obtains the valid authentication methods under the current authentication trust level. * diff --git a/user_auth/v2_0/UserAuthTypes.idl b/user_auth/v2_0/UserAuthTypes.idl index 32c237b5e914b3f4631b57a311ee1adb88ddff3b..d6c6a148cddb4f9494204d8b1951c491ac8af1b9 100644 --- a/user_auth/v2_0/UserAuthTypes.idl +++ b/user_auth/v2_0/UserAuthTypes.idl @@ -182,6 +182,8 @@ struct ExecutorRegisterInfo { unsigned int executorMatcher; /**< Executor secure level. See @{ExecutorSecureLevel}. */ int esl; + /**< Indicates the max acl of template.*/ + unsigned int maxTemplateAcl; /**< Public key of the executor. */ unsigned char[] publicKey; };