From c090cf7401334b8313bd713ca9a59986ac5a39bf Mon Sep 17 00:00:00 2001 From: liuziwei Date: Thu, 25 Apr 2024 01:34:08 +0000 Subject: [PATCH 1/3] update camera/metadata/include/camera_device_ability_items.h. Signed-off-by: liuziwei --- camera/metadata/include/camera_device_ability_items.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/camera/metadata/include/camera_device_ability_items.h b/camera/metadata/include/camera_device_ability_items.h index 6c8ffccb..0399f7e7 100644 --- a/camera/metadata/include/camera_device_ability_items.h +++ b/camera/metadata/include/camera_device_ability_items.h @@ -674,10 +674,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 { -- Gitee From 01c05bd3bbc9e0347f7f4916050c79aa3852b6ed Mon Sep 17 00:00:00 2001 From: liuziwei Date: Thu, 25 Apr 2024 03:03:05 +0000 Subject: [PATCH 2/3] update user_auth/v2_0/IUserAuthInterface.idl. Signed-off-by: liuziwei --- user_auth/v2_0/IUserAuthInterface.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_auth/v2_0/IUserAuthInterface.idl b/user_auth/v2_0/IUserAuthInterface.idl index 80dbdf24..bbdba0ad 100644 --- a/user_auth/v2_0/IUserAuthInterface.idl +++ b/user_auth/v2_0/IUserAuthInterface.idl @@ -281,7 +281,7 @@ interface IUserAuthInterface { * @since 3.2 * @version 2.0 */ - GetAvaliableStatus([in] int userId, [in] int authType, [in] unsigned int authTrustLevel, [out] int checkResult); + GetAvaliableStatus([in] int userId, [in] int authType, [in] unsigned uint authTrustLevel, [out] int checkResult); /** * @brief Obtains the valid authentication methods under the current authentication trust level. * -- Gitee From 0b6861c16144d2a7a0d2a570b288434a22ae7103 Mon Sep 17 00:00:00 2001 From: liuziwei Date: Thu, 25 Apr 2024 03:05:54 +0000 Subject: [PATCH 3/3] update user_auth/v2_0/IUserAuthInterface.idl. Signed-off-by: liuziwei --- user_auth/v2_0/IUserAuthInterface.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_auth/v2_0/IUserAuthInterface.idl b/user_auth/v2_0/IUserAuthInterface.idl index bbdba0ad..80dbdf24 100644 --- a/user_auth/v2_0/IUserAuthInterface.idl +++ b/user_auth/v2_0/IUserAuthInterface.idl @@ -281,7 +281,7 @@ interface IUserAuthInterface { * @since 3.2 * @version 2.0 */ - GetAvaliableStatus([in] int userId, [in] int authType, [in] unsigned uint authTrustLevel, [out] int checkResult); + GetAvaliableStatus([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. * -- Gitee