From 43f91fd7aa0fbc0eda27c070800b601c40eefc11 Mon Sep 17 00:00:00 2001 From: greensue Date: Tue, 11 Mar 2025 09:47:55 +0800 Subject: [PATCH 01/94] jit ACL: change version to 18 Signed-off-by: greensue --- ark_runtime/jsvm/jsvm_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ark_runtime/jsvm/jsvm_types.h b/ark_runtime/jsvm/jsvm_types.h index 999214b1a..8432207c5 100644 --- a/ark_runtime/jsvm/jsvm_types.h +++ b/ark_runtime/jsvm/jsvm_types.h @@ -332,7 +332,7 @@ typedef enum { */ JSVM_INVALID_TYPE, /** jit mode expected status. - * @since 15 + * @since 18 */ JSVM_JIT_MODE_EXPECTED, } JSVM_Status; -- Gitee From 7d245be65909a813a27dee211a5ed09454a954ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B0=B8=E5=87=AF?= Date: Fri, 14 Mar 2025 15:07:46 +0800 Subject: [PATCH 02/94] axis_c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘永凯 --- arkui/ace_engine/native/libace.ndk.json | 4 ++-- arkui/ace_engine/native/native_node.h | 2 +- arkui/ace_engine/native/ui_input_event.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index c80fc0750..277c17f6d 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3008,11 +3008,11 @@ "name": "OH_ArkUI_UIInputEvent_GetModifierKeyStates" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_AxisEvent_SetPropagation" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_AxisEvent_GetScrollStep" }, { diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index c246d755f..51d0ad79d 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -6596,7 +6596,7 @@ typedef enum { * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is * {@link ArkUI_UIInputEvent}. \n * - * @since 18 + * @since 17 */ NODE_ON_AXIS = 25, diff --git a/arkui/ace_engine/native/ui_input_event.h b/arkui/ace_engine/native/ui_input_event.h index 37497b231..24c0022d7 100644 --- a/arkui/ace_engine/native/ui_input_event.h +++ b/arkui/ace_engine/native/ui_input_event.h @@ -1028,7 +1028,7 @@ int32_t OH_ArkUI_UIInputEvent_GetTargetDisplayId(const ArkUI_UIInputEvent* event * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 18 + * @since 17 */ int32_t OH_ArkUI_AxisEvent_SetPropagation(const ArkUI_UIInputEvent* event, bool propagation); @@ -1037,7 +1037,7 @@ int32_t OH_ArkUI_AxisEvent_SetPropagation(const ArkUI_UIInputEvent* event, bool * * @param event Pointer to the UI input event. * @return Returns the scroll step configuration of the mouse wheel axis event. - * @since 18 + * @since 17 */ int32_t OH_ArkUI_AxisEvent_GetScrollStep(const ArkUI_UIInputEvent* event); -- Gitee From 06f6149eb08caa7696e9503274cda3bd5102bdef Mon Sep 17 00:00:00 2001 From: lihui Date: Mon, 17 Mar 2025 19:23:05 +0800 Subject: [PATCH 03/94] add surface api 6.0 Signed-off-by: lihui --- .../kit_sub_system/c_file_kit_sub_system.json | 1 + .../graphic_2d/native_buffer/native_buffer.h | 15 +++ graphic/graphic_2d/native_fence/BUILD.gn | 32 ++++++ .../native_fence/libnative_fence.ndk.json | 18 ++++ .../graphic_2d/native_fence/native_fence.h | 97 +++++++++++++++++++ ndk_targets.gni | 2 + 6 files changed, 165 insertions(+) create mode 100644 graphic/graphic_2d/native_fence/BUILD.gn create mode 100644 graphic/graphic_2d/native_fence/libnative_fence.ndk.json create mode 100644 graphic/graphic_2d/native_fence/native_fence.h diff --git a/build-tools/capi_parser/src/coreImpl/parser/kit_sub_system/c_file_kit_sub_system.json b/build-tools/capi_parser/src/coreImpl/parser/kit_sub_system/c_file_kit_sub_system.json index 2e7636057..dcd33f4b7 100644 --- a/build-tools/capi_parser/src/coreImpl/parser/kit_sub_system/c_file_kit_sub_system.json +++ b/build-tools/capi_parser/src/coreImpl/parser/kit_sub_system/c_file_kit_sub_system.json @@ -297,6 +297,7 @@ "kitName": "ArkGraphicsD", "subSystem": "图形图像" }, + { "filePath": "graphic/graphic_2d/native_fence/native_fence.h", "kitName": "NA", "subSystem": "图形图像" }, { "filePath": "third_party/vulkan-headers/vulkan/vk_platform.h", "kitName": "NA", "subSystem": "图形图像" }, { "filePath": "third_party/vulkan-headers/vulkan/vulkan.h", "kitName": "NA", "subSystem": "图形图像" }, { "filePath": "third_party/vulkan-headers/vulkan/vulkan_core.h", "kitName": "NA", "subSystem": "图形图像" }, diff --git a/graphic/graphic_2d/native_buffer/native_buffer.h b/graphic/graphic_2d/native_buffer/native_buffer.h index 70d47a631..734fdc04b 100644 --- a/graphic/graphic_2d/native_buffer/native_buffer.h +++ b/graphic/graphic_2d/native_buffer/native_buffer.h @@ -61,6 +61,11 @@ typedef enum OH_NativeBuffer_Usage { NATIVEBUFFER_USAGE_CPU_READ = (1ULL << 0), /// < CPU read buffer */ NATIVEBUFFER_USAGE_CPU_WRITE = (1ULL << 1), /// < CPU write memory */ NATIVEBUFFER_USAGE_MEM_DMA = (1ULL << 3), /// < Direct memory access (DMA) buffer */ + /** + * MMZ with cache + * @since 20 + */ + NATIVEBUFFER_USAGE_MEM_MMZ_CACHE = (1ULL << 5), NATIVEBUFFER_USAGE_HW_RENDER = (1ULL << 8), /// < For GPU write case */ NATIVEBUFFER_USAGE_HW_TEXTURE = (1ULL << 9), /// < For GPU read case */ NATIVEBUFFER_USAGE_CPU_READ_OFTEN = (1ULL << 16), /// < Often be mapped for direct CPU reads */ @@ -203,6 +208,16 @@ typedef enum OH_NativeBuffer_Format { * @since 15 */ NATIVEBUFFER_PIXEL_FMT_RGBA16_FLOAT, + /** + * RGBA16 Y8 format + * @since 20 + */ + NATIVEBUFFER_PIXEL_FMT_Y8 = 40, + /** + * RGBA16 Y16 format + * @since 20 + */ + NATIVEBUFFER_PIXEL_FMT_Y16 = 41, /** * vendor mask format * @since 12 diff --git a/graphic/graphic_2d/native_fence/BUILD.gn b/graphic/graphic_2d/native_fence/BUILD.gn new file mode 100644 index 000000000..7709bc1e4 --- /dev/null +++ b/graphic/graphic_2d/native_fence/BUILD.gn @@ -0,0 +1,32 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") +import("//build/ohos/ndk/ndk.gni") + +ohos_ndk_headers("native_fence_header") { + dest_dir = "$ndk_headers_out_dir/native_fence" + sources = [ + "./native_fence.h", + ] +} + +ohos_ndk_library("libnative_fence_ndk") { + output_name = "native_fence" + output_extension = "so" + ndk_description_file = "./libnative_fence.ndk.json" + system_capability = "SystemCapability.Graphic.Graphic2D.NativeFence" + system_capability_headers = [ + "native_fence/native_fence.h", + ] +} diff --git a/graphic/graphic_2d/native_fence/libnative_fence.ndk.json b/graphic/graphic_2d/native_fence/libnative_fence.ndk.json new file mode 100644 index 000000000..b29686ae5 --- /dev/null +++ b/graphic/graphic_2d/native_fence/libnative_fence.ndk.json @@ -0,0 +1,18 @@ +[ + { + "first_introduced": "20", + "name": "OH_NativeFence_IsValid" + }, + { + "first_introduced": "20", + "name": "OH_NativeFence_Wait" + }, + { + "first_introduced": "20", + "name": "OH_NativeFence_WaitForever" + }, + { + "first_introduced": "20", + "name": "OH_NativeFence_Close" + } +] \ No newline at end of file diff --git a/graphic/graphic_2d/native_fence/native_fence.h b/graphic/graphic_2d/native_fence/native_fence.h new file mode 100644 index 000000000..d755b1a7f --- /dev/null +++ b/graphic/graphic_2d/native_fence/native_fence.h @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup NativeFence + * @{ + * + * @brief Provides the native fence capability + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeFence + * @since 8 + * @version 1.0 + */ + +/** + * @file native_fence.h + * + * @brief Defines the functions for using native fence. + * + * @kit ArkGraphics2D + * @library libnative_fence.so + * @syscap SystemCapability.Graphic.Graphic2D.NativeFence + * @since 8 + * @version 1.0 + */ + +#ifndef NDK_INCLUDE_NATIVE_FENCE_H_ +#define NDK_INCLUDE_NATIVE_FENCE_H_ + +#include + +#ifdef __cplusplus +extern "C" { +#endif +/** + * @brief Checks if the fence is valid. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeFence + * @param fenceFd Indicates a file descriptor handle, which is used for timing synchronization. + * @return Returns true means the fence is valid, otherwise, invalid. + * @since 20 + * @version 1.0 + */ +bool OH_NativeFence_IsValid(int fenceFd); + +/** + * @brief Waits for a fence signal. The maximum waiting time is determined by the timeout parameter.\n + * If the fence is invalid, it is equivalent to the fence having signaled, and the function will return true immediately. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeFence + * @param fenceFd Indicates a file descriptor handle, which is used for timing synchronization. + * @param timeout Indicates the timeout duration. + * @return Returns true if the fence signaled, false otherwise. + * @since 20 + * @version 1.0 + */ +bool OH_NativeFence_Wait(int fenceFd, uint32_t timeout); + +/** + * @brief Waits forever for a fence signal.\n + * If the fence is invalid, it is equivalent to the fence having signaled, and the function will return true immediately. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeFence + * @param fenceFd Indicates a file descriptor handle, which is used for timing synchronization. + * @return Returns true if the fence signaled, false otherwise. + * @since 20 + * @version 1.0 + */ +bool OH_NativeFence_WaitForever(int fenceFd); + +/** + * @brief Close the fence + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeFence + * @param fenceFd Indicates a file descriptor handle, which is used for timing synchronization. + * @since 20 + * @version 1.0 + */ +void OH_NativeFence_Close(int fenceFd); +#ifdef __cplusplus +} +#endif + +/** @} */ +#endif \ No newline at end of file diff --git a/ndk_targets.gni b/ndk_targets.gni index 25da4956f..114235744 100644 --- a/ndk_targets.gni +++ b/ndk_targets.gni @@ -86,6 +86,8 @@ _ndk_library_targets = [ "//interface/sdk_c/graphic/graphic_2d/native_image:native_image_header", "//interface/sdk_c/graphic/graphic_2d/native_vsync:libnative_vsync_ndk", "//interface/sdk_c/graphic/graphic_2d/native_vsync:native_vsync_header", + "//interface/sdk_c/graphic/graphic_2d/native_fence:libnative_fence_ndk", + "//interface/sdk_c/graphic/graphic_2d/native_fence:native_fence_header", "//interface/sdk_c/graphic/graphic_2d/native_color_space_manager:libnative_color_space_manager_ndk", "//interface/sdk_c/graphic/graphic_2d/native_color_space_manager:native_color_space_manager_header", "//interface/sdk_c/graphic/graphic_2d/native_drawing:libnative_drawing_ndk", -- Gitee From ff7c78af5254f760e18356368c1a5b7096e17724 Mon Sep 17 00:00:00 2001 From: Zenix Date: Sat, 15 Mar 2025 09:41:24 +0800 Subject: [PATCH 04/94] fix sdk Signed-off-by: Zenix --- arkui/ace_engine/native/drag_and_drop.h | 8 +++++--- arkui/ace_engine/native/libace.ndk.json | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arkui/ace_engine/native/drag_and_drop.h b/arkui/ace_engine/native/drag_and_drop.h index d66607752..9bc220407 100644 --- a/arkui/ace_engine/native/drag_and_drop.h +++ b/arkui/ace_engine/native/drag_and_drop.h @@ -855,7 +855,7 @@ int32_t OH_ArkUI_StartDrag(ArkUI_DragAction* dragAction); * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. * Returns {@link ARKUI_ERROR_CODE_DRAG_DROP_OPERATION_NOT_ALLOWED} if current is not during the drop handing. - * @since 16 + * @since 18 */ int32_t OH_ArkUI_DragEvent_RequestDragEndPending(ArkUI_DragEvent* event, int32_t* requestIdentify); @@ -869,7 +869,8 @@ int32_t OH_ArkUI_DragEvent_RequestDragEndPending(ArkUI_DragEvent* event, int32_t * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 16 + * Returns {@link ARKUI_ERROR_CODE_DRAG_DROP_OPERATION_NOT_ALLOWED} if current is not during the drop handing. + * @since 18 */ int32_t OH_ArkUI_NotifyDragResult(int32_t requestIdentify, ArkUI_DragResult result); @@ -880,7 +881,8 @@ int32_t OH_ArkUI_NotifyDragResult(int32_t requestIdentify, ArkUI_DragResult resu * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 16 + * Returns {@link ARKUI_ERROR_CODE_DRAG_DROP_OPERATION_NOT_ALLOWED} if current is not during the drop handing. + * @since 18 */ int32_t OH_ArkUI_NotifyDragEndPendingDone(int32_t requestIdentify); diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index da8d24c9f..a9ac352a9 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -2792,15 +2792,15 @@ "name": "OH_ArkUI_AxisEvent_GetScrollStep" }, { - "first_introduced": "16", + "first_introduced": "18", "name": "OH_ArkUI_DragEvent_RequestDragEndPending" }, { - "first_introduced": "16", + "first_introduced": "18", "name": "OH_ArkUI_NotifyDragResult" }, { - "first_introduced": "16", + "first_introduced": "18", "name": "OH_ArkUI_NotifyDragEndPendingDone" }, { -- Gitee From 3790cb6f55ebeeca76937f0a4eafa5b26bf30689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B0=B8=E5=87=AF?= Date: Fri, 14 Mar 2025 11:14:14 +0800 Subject: [PATCH 05/94] capi inter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘永凯 --- arkui/ace_engine/native/libace.ndk.json | 16 ++++++++-------- arkui/ace_engine/native/native_node.h | 2 +- arkui/ace_engine/native/ui_input_event.h | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index c80fc0750..18b486ae5 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -2976,35 +2976,35 @@ "name": "OH_ArkUI_VisibleAreaEventOptions_GetExpectedUpdateInterval" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_UIInputEvent_GetEventTargetWidth" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_UIInputEvent_GetEventTargetHeight" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_UIInputEvent_GetEventTargetPositionX" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_UIInputEvent_GetEventTargetPositionY" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionX" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionY" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_HoverEvent_IsHovered" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_UIInputEvent_GetModifierKeyStates" }, { diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index c246d755f..81f7fec06 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -6617,7 +6617,7 @@ typedef enum { * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is * {@link ArkUI_UIInputEvent}. \n * - *@since 18 + *@since 17 */ NODE_ON_HOVER_EVENT = 27, diff --git a/arkui/ace_engine/native/ui_input_event.h b/arkui/ace_engine/native/ui_input_event.h index 37497b231..18de984cd 100644 --- a/arkui/ace_engine/native/ui_input_event.h +++ b/arkui/ace_engine/native/ui_input_event.h @@ -888,7 +888,7 @@ int32_t OH_ArkUI_FocusAxisEvent_SetStopPropagation(const ArkUI_UIInputEvent* eve * * @param event Pointer to an ArkUI_UIInputEvent object. * @return Returns the width of the component hit by the event; returns 0.0f if any parameter error occurs. -* @since 18 +* @since 17 */ float OH_ArkUI_UIInputEvent_GetEventTargetWidth(const ArkUI_UIInputEvent* event); @@ -897,7 +897,7 @@ float OH_ArkUI_UIInputEvent_GetEventTargetWidth(const ArkUI_UIInputEvent* event) * * @param event Pointer to an ArkUI_UIInputEvent object. * @return Returns the height of the component hit by the event; returns 0.0f if any parameter error occurs. -* @since 18 +* @since 17 */ float OH_ArkUI_UIInputEvent_GetEventTargetHeight(const ArkUI_UIInputEvent* event); @@ -906,7 +906,7 @@ float OH_ArkUI_UIInputEvent_GetEventTargetHeight(const ArkUI_UIInputEvent* event * * @param event Pointer to an ArkUI_UIInputEvent object. * @return Returns the X coordinate of the component hit by the event; returns 0.0f if any parameter error occurs. -* @since 18 +* @since 17 */ float OH_ArkUI_UIInputEvent_GetEventTargetPositionX(const ArkUI_UIInputEvent* event); @@ -916,7 +916,7 @@ float OH_ArkUI_UIInputEvent_GetEventTargetPositionX(const ArkUI_UIInputEvent* ev * @param event Pointer to an ArkUI_UIInputEvent object. * @return Returns the Y coordinate of the component hit by the event; * returns 0.0f if any parameter error occurs. -* @since 18 +* @since 17 */ float OH_ArkUI_UIInputEvent_GetEventTargetPositionY(const ArkUI_UIInputEvent* event); @@ -926,7 +926,7 @@ float OH_ArkUI_UIInputEvent_GetEventTargetPositionY(const ArkUI_UIInputEvent* ev * @param event Pointer to an ArkUI_UIInputEvent object. * @return Returns the global X coordinate of the component hit by the event; * returns 0.0f if any parameter error occurs. -* @since 18 +* @since 17 */ float OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionX(const ArkUI_UIInputEvent* event); @@ -936,7 +936,7 @@ float OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionX(const ArkUI_UIInputEve * @param event Pointer to an ArkUI_UIInputEvent object. * @return Returns the global Y coordinate of the component hit by the event; * returns 0.0f if any parameter error occurs. -* @since 18 +* @since 17 */ float OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionY(const ArkUI_UIInputEvent* event); @@ -946,7 +946,7 @@ float OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionY(const ArkUI_UIInputEve * @param event Pointer to an ArkUI_UIInputEvent object. * @return Returns true if the cursor is hovering over the current component. * Returns false if the cursor is not hovering over the current component. -* @since 18 +* @since 17 */ bool OH_ArkUI_HoverEvent_IsHovered(const ArkUI_UIInputEvent* event); @@ -959,7 +959,7 @@ bool OH_ArkUI_HoverEvent_IsHovered(const ArkUI_UIInputEvent* event); * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 18 + * @since 17 */ int32_t OH_ArkUI_UIInputEvent_GetModifierKeyStates(const ArkUI_UIInputEvent* event, uint64_t* keys); -- Gitee From febd446dee0a91e762ca4f12474d3b9871b38c87 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Sat, 15 Mar 2025 13:04:56 +0800 Subject: [PATCH 06/94] =?UTF-8?q?Dialog=E7=BB=84=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E8=83=8C=E6=99=AF=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=20CAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghang Change-Id: I4f6816aec3fe0a98ee4346093731cb110a4a00ab --- arkui/ace_engine/native/libace.ndk.json | 8 ++++ arkui/ace_engine/native/native_dialog.h | 53 +++++++++++++++++++++++++ arkui/ace_engine/native/native_type.h | 15 +++++++ 3 files changed, 76 insertions(+) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index c80fc0750..ddd0072e2 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3175,6 +3175,14 @@ "first_introduced": "18", "name": "OH_ArkUI_CustomDialog_SetHoverModeArea" }, + { + "first_introduced": "18", + "name": "OH_ArkUI_CustomDialog_SetBackgroundBlurStyleOptions" + }, + { + "first_introduced": "18", + "name": "OH_ArkUI_CustomDialog_SetBackgroundEffect" + }, { "first_introduced": "18", "name": "OH_ArkUI_CustomDialog_RegisterOnWillDismissCallback" diff --git a/arkui/ace_engine/native/native_dialog.h b/arkui/ace_engine/native/native_dialog.h index 5de204ab4..bedf2c0e7 100644 --- a/arkui/ace_engine/native/native_dialog.h +++ b/arkui/ace_engine/native/native_dialog.h @@ -642,6 +642,33 @@ typedef struct { * @since 18 */ int32_t (*setFocusable)(ArkUI_NativeDialogHandle handle, bool focusable); + + /** + * @brief Sets the background blur effect for a custom dialog box. + * + * @note This method must be called before the show method. + * @param handle Indicates the pointer to the custom dialog box controller. + * @param backgroundBlurStyleOptions Background blur effect options. + * @return Returns the result code. + * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. + * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. + * @since 18 + */ + int32_t (*setBackgroundBlurStyleOptions)( + ArkUI_NativeDialogHandle handle, const ArkUI_AttributeItem* backgroundBlurStyleOptions); + + /** + * @brief Sets the background effect parameters for a custom dialog box. + * + * @note This method must be called before the show method. + * @param handle Indicates the pointer to the custom dialog box controller. + * @param backgroundEffect Background effect. + * @return Returns the result code. + * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. + * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. + * @since 18 + */ + int32_t (*setBackgroundEffect)(ArkUI_NativeDialogHandle handle, const ArkUI_AttributeItem* backgroundEffect); } ArkUI_NativeDialogAPI_3; /** @@ -1087,6 +1114,32 @@ int32_t OH_ArkUI_CustomDialog_RegisterOnWillDisappearCallback( int32_t OH_ArkUI_CustomDialog_RegisterOnDidDisappearCallback( ArkUI_CustomDialogOptions* options, void* userData, void (*callback)(void* userData)); +/** + * @brief Sets the background blur effect for a dialog box. + * + * @param options Dialog box parameters. + * @param backgroundBlurStyleOptions Background blur effect options of the dialog box. + * @return Returns the result code. + * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. + * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. + * @since 18 + */ +int32_t OH_ArkUI_CustomDialog_SetBackgroundBlurStyleOptions( + ArkUI_CustomDialogOptions* options, const ArkUI_AttributeItem* backgroundBlurStyleOptions); + +/** + * @brief Sets the background effect parameters for a dialog box. + * + * @param options Dialog box parameters. + * @param backgroundEffect Background effect of the dialog box. + * @return Returns the result code. + * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. + * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. + * @since 18 + */ +int32_t OH_ArkUI_CustomDialog_SetBackgroundEffect( + ArkUI_CustomDialogOptions* options, const ArkUI_AttributeItem* backgroundEffect); + #ifdef __cplusplus }; #endif diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 64676cb95..a09027bc1 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -1164,6 +1164,21 @@ typedef enum { ARKUI_BLUR_STYLE_COMPONENT_ULTRA_THICK, } ArkUI_BlurStyle; +/** + * @brief Enumerates the activation policies for the background blur effect. + * + * @since 18 + */ +typedef enum { + /** The blur effect changes according to the window's focus state; + * it is inactive when the window is not in focus and active when the window is in focus. */ + ARKUI_BLUR_STYLE_ACTIVE_POLICY_FOLLOWS_WINDOW_ACTIVE_STATE = 0, + /** The blur effect is always active. */ + ARKUI_BLUR_STYLE_ACTIVE_POLICY_ALWAYS_ACTIVE, + /** The blur effect is always inactive. */ + ARKUI_BLUR_STYLE_ACTIVE_POLICY_ALWAYS_INACTIVE, +} ArkUI_BlurStyleActivePolicy; + /** * @brief Enumerates the vertical alignment modes. * -- Gitee From 4073b24c4a042107e1c9936309c6c894f3da7c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E5=80=A9?= Date: Tue, 25 Mar 2025 07:52:32 +0000 Subject: [PATCH 07/94] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 任倩 --- .../pasteboard/include/oh_pasteboard.h | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/distributeddatamgr/pasteboard/include/oh_pasteboard.h b/distributeddatamgr/pasteboard/include/oh_pasteboard.h index c4b9c2f66..8cfdeac39 100644 --- a/distributeddatamgr/pasteboard/include/oh_pasteboard.h +++ b/distributeddatamgr/pasteboard/include/oh_pasteboard.h @@ -25,7 +25,7 @@ */ /** - * @file OH_Pasteboard.h + * @file OH_pasteboard.h * * @brief Provides APIs and enums of the Pasteboard module. * @@ -209,13 +209,13 @@ void OH_Pasteboard_Destroy(OH_Pasteboard* pasteboard); * @brief Subscribes to the Pasteboard data change. * * @param pasteboard Pointer to the {@link OH_Pasteboard} instance. - * @param type Event type to subscribe to. + * @param type Event type to subscribe to reporting the pasteboard data change. For details, see {@link Pasteboard_NotifyType}. * @param observer - Pointer to the observer information, which specifies the callback used to * reporting the pasteboard data change. For details, see {@link OH_PasteboardObserver}. * @return Returns the status code of the execution. For details, {@link PASTEBOARD_ErrCode}. * Returns {@link ERR_OK} if the operation is successful. * Returns {@link ERR_INVALID_PARAMETER} if invalid args are detected. - * @see OH_Pasteboard OH_PasteboardObserver PASTEBOARD_ErrCode. + * @see OH_Pasteboard OH_PasteboardObserver Pasteboard_NotifyType PASTEBOARD_ErrCode. * @since 13 */ int OH_Pasteboard_Subscribe(OH_Pasteboard* pasteboard, int type, const OH_PasteboardObserver* observer); @@ -224,13 +224,13 @@ int OH_Pasteboard_Subscribe(OH_Pasteboard* pasteboard, int type, const OH_Pasteb * @brief Unsubscribes from the Pasteboard data change. * * @param pasteboard Pointer to the {@link OH_Pasteboard} instance. - * @param type Event type to subscribe to. + * @param type Event type to subscribe to reporting the pasteboard data change. For details, see {@link Pasteboard_NotifyType}. * @param observer - Pointer to the observer information, which specifies the callback used to * reporting the pasteboard data change. For details, see {@link OH_PasteboardObserver}. * @return Returns the status code of the execution. For details, {@link PASTEBOARD_ErrCode}. * Returns {@link ERR_OK} if the operation is successful. * Returns {@link ERR_INVALID_PARAMETER} if invalid args are detected. - * @see OH_Pasteboard OH_PasteboardObserver PASTEBOARD_ErrCode. + * @see OH_Pasteboard OH_PasteboardObserver Pasteboard_NotifyType PASTEBOARD_ErrCode. * @since 13 */ int OH_Pasteboard_Unsubscribe(OH_Pasteboard* pasteboard, int type, const OH_PasteboardObserver* observer); @@ -349,7 +349,7 @@ uint32_t OH_Pasteboard_GetChangeCount(OH_Pasteboard *pasteboard); * * @return If the operation is successful, a pointer to the instance of the {@link Pasteboard_GetDataParams} * structure is returned. If the operation is failed, nullptr is returned. - * @see Pasteboard_GetDataParams + * @see Pasteboard_GetDataParams. * @since 15 */ Pasteboard_GetDataParams *OH_Pasteboard_GetDataParams_Create(void); @@ -358,7 +358,7 @@ Pasteboard_GetDataParams *OH_Pasteboard_GetDataParams_Create(void); * @brief Destroy a pointer that points to an instance of {@link Pasteboard_GetDataParams}. * * @param params Represents a pointer to an instance of {@link Pasteboard_GetDataParams}. - * @see Pasteboard_GetDataParams + * @see Pasteboard_GetDataParams. * @since 15 */ void OH_Pasteboard_GetDataParams_Destroy(Pasteboard_GetDataParams* params); @@ -368,7 +368,7 @@ void OH_Pasteboard_GetDataParams_Destroy(Pasteboard_GetDataParams* params); * * @param params Represents a pointer to an instance of {@link Pasteboard_GetDataParams}. * @param progressIndicator Represents to the progress indicator. - * @see Pasteboard_GetDataParams Pasteboard_ProgressIndicator + * @see Pasteboard_GetDataParams Pasteboard_ProgressIndicator. * @since 15 */ void OH_Pasteboard_GetDataParams_SetProgressIndicator(Pasteboard_GetDataParams* params, @@ -380,7 +380,7 @@ void OH_Pasteboard_GetDataParams_SetProgressIndicator(Pasteboard_GetDataParams* * @param params Represents a pointer to an instance of {@link Pasteboard_GetDataParams}. * @param destUri Pointer to a destination uri. * @param destUriLen Indicates the length of destination uri. - * @see Pasteboard_GetDataParams + * @see Pasteboard_GetDataParams. * @since 15 */ void OH_Pasteboard_GetDataParams_SetDestUri(Pasteboard_GetDataParams* params, const char* destUri, uint32_t destUriLen); @@ -390,7 +390,7 @@ void OH_Pasteboard_GetDataParams_SetDestUri(Pasteboard_GetDataParams* params, co * * @param params Represents a pointer to an instance of {@link Pasteboard_GetDataParams}. * @param option Represents to the file conflict options. - * @see Pasteboard_GetDataParams Pasteboard_FileConflictOptions + * @see Pasteboard_GetDataParams Pasteboard_FileConflictOptions. * @since 15 */ void OH_Pasteboard_GetDataParams_SetFileConflictOptions(Pasteboard_GetDataParams* params, @@ -401,7 +401,7 @@ void OH_Pasteboard_GetDataParams_SetFileConflictOptions(Pasteboard_GetDataParams * * @param params Represents a pointer to an instance of {@link Pasteboard_GetDataParams}. * @param listener Represents to the data progress listener. - * @see Pasteboard_GetDataParams OH_Pasteboard_ProgressListener + * @see Pasteboard_GetDataParams OH_Pasteboard_ProgressListener. * @since 15 */ void OH_Pasteboard_GetDataParams_SetProgressListener(Pasteboard_GetDataParams* params, @@ -412,7 +412,7 @@ void OH_Pasteboard_GetDataParams_SetProgressListener(Pasteboard_GetDataParams* p * * @param progressInfo Represents a pointer to an instance of {@link Pasteboard_ProgressInfo}. * @return Returns the progress. - * @see Pasteboard_ProgressInfo + * @see Pasteboard_ProgressInfo. * @since 15 */ int OH_Pasteboard_ProgressInfo_GetProgress(Pasteboard_ProgressInfo* progressInfo); -- Gitee From aba8526b16726d48d3f1ad7abce25a1716efc24b Mon Sep 17 00:00:00 2001 From: "DESKTOP-H8KLN8I\\lisitao" Date: Wed, 26 Mar 2025 10:51:05 +0800 Subject: [PATCH 08/94] =?UTF-8?q?[L]=20setOnVisibleAreaApproximateChange?= =?UTF-8?q?=20api=2018->17=20=E4=BF=AE=E6=94=B9Signed-off-by:lisitaolisita?= =?UTF-8?q?o3@huawei.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: DESKTOP-H8KLN8I\lisitao --- arkui/ace_engine/native/libace.ndk.json | 12 ++++++------ arkui/ace_engine/native/native_node.h | 4 ++-- arkui/ace_engine/native/native_type.h | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index c80fc0750..6132f64aa 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -2952,27 +2952,27 @@ "name": "OH_ArkUI_KeyframeAnimateOption_GetExpectedFrameRate" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_VisibleAreaEventOptions_Create" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_VisibleAreaEventOptions_Dispose" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_VisibleAreaEventOptions_SetRatios" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_VisibleAreaEventOptions_SetExpectedUpdateInterval" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_VisibleAreaEventOptions_GetRatios" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_VisibleAreaEventOptions_GetExpectedUpdateInterval" }, { diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 68e034586..76651e334 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -1925,7 +1925,7 @@ typedef enum { * .object: parameters for visible area change events. * The parameter type is {@link ArkUI_VisibleAreaEventOptions}. \n * - * @since 18 + * @since 17 */ NODE_VISIBLE_AREA_APPROXIMATE_CHANGE_RATIO = 102, @@ -6641,7 +6641,7 @@ typedef enum { * ArkUI_NodeComponentEvent.data[1].f32: ratio of the component's visible area to its total area * when this callback is invoked. \n * - * @since 18 + * @since 17 */ NODE_VISIBLE_AREA_APPROXIMATE_CHANGE_EVENT = 28, diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 64676cb95..921e4a6ae 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -4958,7 +4958,7 @@ bool OH_ArkUI_CrossLanguageOption_GetAttributeSettingStatus(ArkUI_CrossLanguageO /** * @brief Defines the parameters for visible area change events. * - * @since 18 + * @since 17 */ typedef struct ArkUI_VisibleAreaEventOptions ArkUI_VisibleAreaEventOptions; @@ -4966,7 +4966,7 @@ typedef struct ArkUI_VisibleAreaEventOptions ArkUI_VisibleAreaEventOptions; * @brief Creates an instance of visible area change event parameters * * @return Returns the created instance of visible area change event parameters. -* @since 18 +* @since 17 */ ArkUI_VisibleAreaEventOptions* OH_ArkUI_VisibleAreaEventOptions_Create(); @@ -4974,7 +4974,7 @@ ArkUI_VisibleAreaEventOptions* OH_ArkUI_VisibleAreaEventOptions_Create(); * @brief Disposes of an instance of visible area change event parameters. * * @param option Instance to be destroyed. -* @since 18 +* @since 17 */ void OH_ArkUI_VisibleAreaEventOptions_Dispose(ArkUI_VisibleAreaEventOptions* option); @@ -4992,7 +4992,7 @@ void OH_ArkUI_VisibleAreaEventOptions_Dispose(ArkUI_VisibleAreaEventOptions* opt * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. * If an error code is returned, it may be due to a failure in parameter validation; * the parameter must not be null. -* @since 18 +* @since 17 */ int32_t OH_ArkUI_VisibleAreaEventOptions_SetRatios(ArkUI_VisibleAreaEventOptions* option, float* value, int32_t size); @@ -5006,7 +5006,7 @@ int32_t OH_ArkUI_VisibleAreaEventOptions_SetRatios(ArkUI_VisibleAreaEventOptions * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. * If an error code is returned, it may be due to a failure in parameter validation; * the parameter must not be null. -* @since 18 +* @since 17 */ int32_t OH_ArkUI_VisibleAreaEventOptions_SetExpectedUpdateInterval( ArkUI_VisibleAreaEventOptions *option, int32_t value); @@ -5023,7 +5023,7 @@ int32_t OH_ArkUI_VisibleAreaEventOptions_SetExpectedUpdateInterval( * Returns {@link ARKUI_ERROR_CODE_BUFFER_SIZE_ERROR} if the provided buffer size is insufficient. * If an error code is returned, it may be due to a failure in parameter validation; * the parameter must not be null. - * @since 18 + * @since 17 */ int32_t OH_ArkUI_VisibleAreaEventOptions_GetRatios(ArkUI_VisibleAreaEventOptions* option, float* value, int32_t* size); @@ -5032,7 +5032,7 @@ int32_t OH_ArkUI_VisibleAreaEventOptions_GetRatios(ArkUI_VisibleAreaEventOptions * * @param option Instance of visible area change event parameters. * @return Returns the expected update interval, in ms. Default value: 1000. - * @since 18 + * @since 17 */ int32_t OH_ArkUI_VisibleAreaEventOptions_GetExpectedUpdateInterval(ArkUI_VisibleAreaEventOptions* option); -- Gitee From 9080eab3e57a1f1dd3bb0c3b326943f54e907aaa Mon Sep 17 00:00:00 2001 From: l00844999 Date: Wed, 26 Mar 2025 14:42:25 +0800 Subject: [PATCH 09/94] drawing deprecated Signed-off-by: l00844999 --- graphic/graphic_2d/native_drawing/drawing_gpu_context.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/graphic/graphic_2d/native_drawing/drawing_gpu_context.h b/graphic/graphic_2d/native_drawing/drawing_gpu_context.h index 1949a5e72..584e8d928 100644 --- a/graphic/graphic_2d/native_drawing/drawing_gpu_context.h +++ b/graphic/graphic_2d/native_drawing/drawing_gpu_context.h @@ -51,6 +51,7 @@ extern "C" { * * @since 12 * @version 1.0 + * @deprecated since 18 */ typedef struct { /** If true this allows path mask textures to be cached */ @@ -65,6 +66,8 @@ typedef struct { * @return Returns the pointer to the OH_Drawing_GpuContext object created. * @since 12 * @version 1.0 + * @deprecated since 18 + * @useinstead OH_Drawing_GpuContextCreate */ OH_Drawing_GpuContext* OH_Drawing_GpuContextCreateFromGL(OH_Drawing_GpuContextOptions gpuContextOptions); -- Gitee From f8494f1d5b05f2d5fac2c861ab635f5939ca4736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E5=80=A9?= Date: Wed, 26 Mar 2025 09:44:41 +0000 Subject: [PATCH 10/94] update distributeddatamgr/pasteboard/include/oh_pasteboard.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 任倩 --- distributeddatamgr/pasteboard/include/oh_pasteboard.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distributeddatamgr/pasteboard/include/oh_pasteboard.h b/distributeddatamgr/pasteboard/include/oh_pasteboard.h index 8cfdeac39..bca1c6fe6 100644 --- a/distributeddatamgr/pasteboard/include/oh_pasteboard.h +++ b/distributeddatamgr/pasteboard/include/oh_pasteboard.h @@ -25,7 +25,7 @@ */ /** - * @file OH_pasteboard.h + * @file oh_pasteboard.h * * @brief Provides APIs and enums of the Pasteboard module. * @@ -209,7 +209,7 @@ void OH_Pasteboard_Destroy(OH_Pasteboard* pasteboard); * @brief Subscribes to the Pasteboard data change. * * @param pasteboard Pointer to the {@link OH_Pasteboard} instance. - * @param type Event type to subscribe to reporting the pasteboard data change. For details, see {@link Pasteboard_NotifyType}. + * @param type Event type to subscribe to report the pasteboard data change. For details, see {@link Pasteboard_NotifyType}. * @param observer - Pointer to the observer information, which specifies the callback used to * reporting the pasteboard data change. For details, see {@link OH_PasteboardObserver}. * @return Returns the status code of the execution. For details, {@link PASTEBOARD_ErrCode}. @@ -224,7 +224,7 @@ int OH_Pasteboard_Subscribe(OH_Pasteboard* pasteboard, int type, const OH_Pasteb * @brief Unsubscribes from the Pasteboard data change. * * @param pasteboard Pointer to the {@link OH_Pasteboard} instance. - * @param type Event type to subscribe to reporting the pasteboard data change. For details, see {@link Pasteboard_NotifyType}. + * @param type Event type to subscribe to report the pasteboard data change. For details, see {@link Pasteboard_NotifyType}. * @param observer - Pointer to the observer information, which specifies the callback used to * reporting the pasteboard data change. For details, see {@link OH_PasteboardObserver}. * @return Returns the status code of the execution. For details, {@link PASTEBOARD_ErrCode}. -- Gitee From 31800130147cedf3035bd960cc4a23a70a25a7ae Mon Sep 17 00:00:00 2001 From: lihui Date: Thu, 27 Mar 2025 11:03:15 +0800 Subject: [PATCH 11/94] add surface api 6.0 Signed-off-by: lihui --- graphic/graphic_2d/native_fence/native_fence.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphic/graphic_2d/native_fence/native_fence.h b/graphic/graphic_2d/native_fence/native_fence.h index d755b1a7f..c43d9c4a5 100644 --- a/graphic/graphic_2d/native_fence/native_fence.h +++ b/graphic/graphic_2d/native_fence/native_fence.h @@ -20,7 +20,7 @@ * @brief Provides the native fence capability * * @syscap SystemCapability.Graphic.Graphic2D.NativeFence - * @since 8 + * @since 20 * @version 1.0 */ @@ -32,7 +32,7 @@ * @kit ArkGraphics2D * @library libnative_fence.so * @syscap SystemCapability.Graphic.Graphic2D.NativeFence - * @since 8 + * @since 20 * @version 1.0 */ -- Gitee From f80be0e185a834e14ffd5b152f00508641a5ec2b Mon Sep 17 00:00:00 2001 From: yj Date: Thu, 27 Mar 2025 11:47:31 +0800 Subject: [PATCH 12/94] add the key of H263 Signed-off-by: yj --- multimedia/av_codec/native_avcodec_base.h | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index ce92ddfee..b8c3ea9e4 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -377,6 +377,14 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG2; */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4_PART2; +/** + * @brief Enumerates the MIME type of video h263 codec. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 18 + */ + extern const char *OH_AVCODEC_MIMETYPE_VIDEO_H263; + /** * @brief Key for timeStamp in surface's extraData, value type is int64_t. * @@ -1192,6 +1200,19 @@ typedef enum OH_MPEG4Profile { MPEG4_PROFILE_ADVANCED_SIMPLE = 17, } OH_MPEG4Profile; +/** + * @brief H263 Profile + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 18 + */ + typedef enum OH_H263Profile { + /** Baseline profile */ + H263_PROFILE_BASELINE = 0, + /** Version 1 backward compatibility profile */ + H263_PROFILE_VERSION_1_BACKWARD_COMPATIBILITY = 2, +} OH_H263Profile; + /** * @brief Enumerates the muxer output file format * @@ -1486,6 +1507,31 @@ typedef enum OH_MPEG4Level { MPEG4_LEVEL_6 = 9, } OH_MPEG4Level; +/** + * @brief H263 Level. + * + * @syscap SystemCapability.Multimedia.Media.CodecBase + * @since 18 + */ + typedef enum OH_H263Level { + /** 10 level */ + H263_LEVEL_10 = 0, + /** 20 level */ + H263_LEVEL_20 = 1, + /** 30 level */ + H263_LEVEL_30 = 2, + /** 40 level */ + H263_LEVEL_40 = 3, + /** 45 level */ + H263_LEVEL_45 = 4, + /** 50 level */ + H263_LEVEL_50 = 5, + /** 60 level */ + H263_LEVEL_60 = 6, + /** 70 level */ + H263_LEVEL_70 = 7, +} OH_H263Level; + /** * @brief The reference mode in temporal group of picture. * -- Gitee From 461454f38a6ff05259d053679d25eaaf12ec06c6 Mon Sep 17 00:00:00 2001 From: yj Date: Thu, 27 Mar 2025 14:21:19 +0800 Subject: [PATCH 13/94] add the key of H263 Signed-off-by: yj --- multimedia/av_codec/native_avcodec_base.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index b8c3ea9e4..ab39d8e31 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -383,7 +383,7 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4_PART2; * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 18 */ - extern const char *OH_AVCODEC_MIMETYPE_VIDEO_H263; +extern const char *OH_AVCODEC_MIMETYPE_VIDEO_H263; /** * @brief Key for timeStamp in surface's extraData, value type is int64_t. @@ -1206,7 +1206,7 @@ typedef enum OH_MPEG4Profile { * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 18 */ - typedef enum OH_H263Profile { +typedef enum OH_H263Profile { /** Baseline profile */ H263_PROFILE_BASELINE = 0, /** Version 1 backward compatibility profile */ @@ -1513,7 +1513,7 @@ typedef enum OH_MPEG4Level { * @syscap SystemCapability.Multimedia.Media.CodecBase * @since 18 */ - typedef enum OH_H263Level { +typedef enum OH_H263Level { /** 10 level */ H263_LEVEL_10 = 0, /** 20 level */ -- Gitee From 5e6c6bd9b14aaec97956f5e22d6fad0f84394fb8 Mon Sep 17 00:00:00 2001 From: yj Date: Thu, 27 Mar 2025 14:24:12 +0800 Subject: [PATCH 14/94] add the key of H263 Signed-off-by: yj --- .../av_codec/codec_base/libnative_media_codecbase.ndk.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json b/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json index c84f06a87..2dc000e34 100644 --- a/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json +++ b/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json @@ -87,6 +87,10 @@ "first_introduced": "18", "name": "OH_AVCODEC_MIMETYPE_VIDEO_MPEG4_PART2" }, + { + "first_introduced": "18", + "name": "OH_AVCODEC_MIMETYPE_VIDEO_H263" + }, { "first_introduced": "9", "name": "OH_ED_KEY_TIME_STAMP" -- Gitee From 7e033174837557bebbde4872a026d0727d60c26d Mon Sep 17 00:00:00 2001 From: yang-junfeng0621 Date: Thu, 27 Mar 2025 16:28:06 +0800 Subject: [PATCH 15/94] =?UTF-8?q?OH=5FHuks=5FListAliases=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang-junfeng0621 --- security/huks/include/native_huks_api.h | 17 +++++++++++++++++ security/huks/libhuks.ndk.json | 3 +++ 2 files changed, 20 insertions(+) diff --git a/security/huks/include/native_huks_api.h b/security/huks/include/native_huks_api.h index 37d74511b..3e885d3f5 100644 --- a/security/huks/include/native_huks_api.h +++ b/security/huks/include/native_huks_api.h @@ -437,6 +437,23 @@ struct OH_Huks_Result OH_Huks_FinishSession(const struct OH_Huks_Blob *handle, struct OH_Huks_Result OH_Huks_AbortSession(const struct OH_Huks_Blob *handle, const struct OH_Huks_ParamSet *paramSet); +/** + * @brief Get key alias list. + * + * @param paramSet Indicates the pointer to the parameters required for getting key alias list. + * By default, this parameter is a null pointer. + * @param outData Indicates the pointer to the output data. + * @return {@link OH_Huks_ErrCode#OH_HUKS_SUCCESS} 0 - If the operation is successful. + * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_ILLEGAL_ARGUMENT} 401 - If paramSet or outData is invalid. + * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_INTERNAL_ERROR} 12000012 - If system error ocurred. + * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_COMMUNICATION_FAIL} 12000005 - If Ipc commuication failed. + * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_INSUFFICIENT_MEMORY} 12000014 - If the memory is insufficient. + * @since 12 + * @version 1.0 + */ +struct OH_Huks_Result OH_Huks_ListAliases(const struct OH_Huks_ParamSet *paramSet, + struct OH_Huks_KeyAliasSet **outData); + #ifdef __cplusplus } #endif diff --git a/security/huks/libhuks.ndk.json b/security/huks/libhuks.ndk.json index dac8b7470..b77f21beb 100644 --- a/security/huks/libhuks.ndk.json +++ b/security/huks/libhuks.ndk.json @@ -70,5 +70,8 @@ }, { "name": "OH_Huks_CheckParamMatch" + }, + { + "name":"OH_Huks_ListAliases" } ] \ No newline at end of file -- Gitee From 098b7b44582be541043a271a1112808c0ed32022 Mon Sep 17 00:00:00 2001 From: Trouvaille Date: Thu, 27 Mar 2025 17:16:44 +0800 Subject: [PATCH 16/94] =?UTF-8?q?sdk=5Fc=E4=BB=93=E8=93=9D=E9=BB=84?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Trouvaille --- .../avscreen_capture/libnative_avscreen_capture.ndk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json b/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json index d175c78a7..b5238bb28 100644 --- a/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json +++ b/multimedia/player_framework/avscreen_capture/libnative_avscreen_capture.ndk.json @@ -108,7 +108,7 @@ "name": "OH_AVScreenCapture_ShowCursor" }, { - "first_introduced": "18", + "first_introduced": "15", "name": "OH_AVScreenCapture_SetDisplayCallback" } ] \ No newline at end of file -- Gitee From 7fb7187231c02afc00daa95dac77e3502c8739ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E5=80=A9?= Date: Thu, 27 Mar 2025 09:29:36 +0000 Subject: [PATCH 17/94] update distributeddatamgr/pasteboard/include/oh_pasteboard.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 任倩 --- distributeddatamgr/pasteboard/include/oh_pasteboard.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/distributeddatamgr/pasteboard/include/oh_pasteboard.h b/distributeddatamgr/pasteboard/include/oh_pasteboard.h index bca1c6fe6..520404382 100644 --- a/distributeddatamgr/pasteboard/include/oh_pasteboard.h +++ b/distributeddatamgr/pasteboard/include/oh_pasteboard.h @@ -209,7 +209,8 @@ void OH_Pasteboard_Destroy(OH_Pasteboard* pasteboard); * @brief Subscribes to the Pasteboard data change. * * @param pasteboard Pointer to the {@link OH_Pasteboard} instance. - * @param type Event type to subscribe to report the pasteboard data change. For details, see {@link Pasteboard_NotifyType}. + * @param type Event type to subscribe to report the pasteboard data change. + * For details, see {@link Pasteboard_NotifyType}. * @param observer - Pointer to the observer information, which specifies the callback used to * reporting the pasteboard data change. For details, see {@link OH_PasteboardObserver}. * @return Returns the status code of the execution. For details, {@link PASTEBOARD_ErrCode}. @@ -224,7 +225,8 @@ int OH_Pasteboard_Subscribe(OH_Pasteboard* pasteboard, int type, const OH_Pasteb * @brief Unsubscribes from the Pasteboard data change. * * @param pasteboard Pointer to the {@link OH_Pasteboard} instance. - * @param type Event type to subscribe to report the pasteboard data change. For details, see {@link Pasteboard_NotifyType}. + * @param type Event type to subscribe to report the pasteboard data change. + * For details, see {@link Pasteboard_NotifyType}. * @param observer - Pointer to the observer information, which specifies the callback used to * reporting the pasteboard data change. For details, see {@link OH_PasteboardObserver}. * @return Returns the status code of the execution. For details, {@link PASTEBOARD_ErrCode}. -- Gitee From 0a472003557a3a9b96bd979f115a923f115840e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E5=80=A9?= Date: Thu, 27 Mar 2025 09:55:08 +0000 Subject: [PATCH 18/94] update distributeddatamgr/pasteboard/include/oh_pasteboard.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 任倩 --- distributeddatamgr/pasteboard/include/oh_pasteboard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distributeddatamgr/pasteboard/include/oh_pasteboard.h b/distributeddatamgr/pasteboard/include/oh_pasteboard.h index 520404382..3218fff57 100644 --- a/distributeddatamgr/pasteboard/include/oh_pasteboard.h +++ b/distributeddatamgr/pasteboard/include/oh_pasteboard.h @@ -209,7 +209,7 @@ void OH_Pasteboard_Destroy(OH_Pasteboard* pasteboard); * @brief Subscribes to the Pasteboard data change. * * @param pasteboard Pointer to the {@link OH_Pasteboard} instance. - * @param type Event type to subscribe to report the pasteboard data change. + * @param type Event type to subscribe to report the pasteboard data change. * For details, see {@link Pasteboard_NotifyType}. * @param observer - Pointer to the observer information, which specifies the callback used to * reporting the pasteboard data change. For details, see {@link OH_PasteboardObserver}. @@ -225,7 +225,7 @@ int OH_Pasteboard_Subscribe(OH_Pasteboard* pasteboard, int type, const OH_Pasteb * @brief Unsubscribes from the Pasteboard data change. * * @param pasteboard Pointer to the {@link OH_Pasteboard} instance. - * @param type Event type to subscribe to report the pasteboard data change. + * @param type Event type to subscribe to report the pasteboard data change. * For details, see {@link Pasteboard_NotifyType}. * @param observer - Pointer to the observer information, which specifies the callback used to * reporting the pasteboard data change. For details, see {@link OH_PasteboardObserver}. -- Gitee From 305f2bcffd60f4ce51421a8675c748922fc4e2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BE=89?= Date: Fri, 28 Mar 2025 08:34:47 +0000 Subject: [PATCH 19/94] fix gn format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李辉 Change-Id: I370ebdf6bc92db2b3a38fcd2e356c78d4aed9a27 --- graphic/graphic_2d/native_fence/BUILD.gn | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/graphic/graphic_2d/native_fence/BUILD.gn b/graphic/graphic_2d/native_fence/BUILD.gn index 7709bc1e4..ac784db3d 100644 --- a/graphic/graphic_2d/native_fence/BUILD.gn +++ b/graphic/graphic_2d/native_fence/BUILD.gn @@ -16,9 +16,7 @@ import("//build/ohos/ndk/ndk.gni") ohos_ndk_headers("native_fence_header") { dest_dir = "$ndk_headers_out_dir/native_fence" - sources = [ - "./native_fence.h", - ] + sources = [ "./native_fence.h" ] } ohos_ndk_library("libnative_fence_ndk") { @@ -26,7 +24,5 @@ ohos_ndk_library("libnative_fence_ndk") { output_extension = "so" ndk_description_file = "./libnative_fence.ndk.json" system_capability = "SystemCapability.Graphic.Graphic2D.NativeFence" - system_capability_headers = [ - "native_fence/native_fence.h", - ] + system_capability_headers = [ "native_fence/native_fence.h" ] } -- Gitee From 17435136bfeb4f411714be7e7db97ad936139561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AD=90=E5=BE=AE?= Date: Fri, 28 Mar 2025 17:09:50 +0800 Subject: [PATCH 20/94] [sdkmaster] fix differences in master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王子微 --- multimedia/media_foundation/native_avbuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/media_foundation/native_avbuffer.h b/multimedia/media_foundation/native_avbuffer.h index 29ff41d31..9b8170791 100644 --- a/multimedia/media_foundation/native_avbuffer.h +++ b/multimedia/media_foundation/native_avbuffer.h @@ -133,7 +133,7 @@ OH_AVFormat *OH_AVBuffer_GetParameter(OH_AVBuffer *buffer); * @return Function result code. * {@link AV_ERR_OK} if the execution is successful. * {@link AV_ERR_INVALID_VAL} if input buffer is nullptr, buffer's magic error, - * input buffer's buffer is nulllptr, input format is nullptr, buffer's magic error, or input meta is nullptr. + * input buffer's buffer is nulllptr, input format is nullptr, or input meta is nullptr. * @since 11 */ OH_AVErrCode OH_AVBuffer_SetParameter(OH_AVBuffer *buffer, const OH_AVFormat *format); -- Gitee From 9a0dfe68f5ce64571a53634268fff2f9d299a201 Mon Sep 17 00:00:00 2001 From: ht Date: Sat, 29 Mar 2025 02:36:30 +0000 Subject: [PATCH 21/94] fix annotation Signed-off-by: ht --- .../relational_store/include/relational_store_error_code.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributeddatamgr/relational_store/include/relational_store_error_code.h b/distributeddatamgr/relational_store/include/relational_store_error_code.h index c75b849e0..053fb1e17 100644 --- a/distributeddatamgr/relational_store/include/relational_store_error_code.h +++ b/distributeddatamgr/relational_store/include/relational_store_error_code.h @@ -415,7 +415,7 @@ typedef enum OH_Rdb_ErrCode { RDB_E_TYPE_MISMATCH = (E_BASE + 64), /** - * @brief Data value type is null. + * @brief SQLite: Abort due to constraint violation. * * @since 18 */ -- Gitee From f3ca80440ed87a14f05e17d94ca73dcd4ee31972 Mon Sep 17 00:00:00 2001 From: yiyajun Date: Sat, 29 Mar 2025 14:08:36 +0800 Subject: [PATCH 22/94] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yiyajun --- ConnectivityKit/wifi/oh_wifi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConnectivityKit/wifi/oh_wifi.h b/ConnectivityKit/wifi/oh_wifi.h index 1d8e1d645..366c07ab7 100644 --- a/ConnectivityKit/wifi/oh_wifi.h +++ b/ConnectivityKit/wifi/oh_wifi.h @@ -24,7 +24,7 @@ * @file oh_wifi.h * @kit ConnectivityKit * @brief Define interfaces for querying wifi switch status. - * @library libwifi.so + * @library libwifi_ndk.so * @syscap SystemCapability.Communication.WiFi.STA * @since 13 */ -- Gitee From 54ea3d2626f446bcab088e276a4fae588a28d102 Mon Sep 17 00:00:00 2001 From: huchao Date: Sat, 29 Mar 2025 17:00:56 +0800 Subject: [PATCH 23/94] modify libimage_commin.so error Signed-off-by: huchao --- multimedia/image_framework/include/image/image_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/image_framework/include/image/image_common.h b/multimedia/image_framework/include/image/image_common.h index 67d972adf..d17f95a5d 100644 --- a/multimedia/image_framework/include/image/image_common.h +++ b/multimedia/image_framework/include/image/image_common.h @@ -27,7 +27,7 @@ * * @brief Declares the common enums and structs used by the image interface. * - * @library libpixelmap.so + * @library libimage_common.so * @kit ImageKit * @syscap SystemCapability.Multimedia.Image.Core * @since 12 -- Gitee From 0495adb0938dbe4b64394539e648df1455956e36 Mon Sep 17 00:00:00 2001 From: wangqing Date: Mon, 31 Mar 2025 17:03:45 +0800 Subject: [PATCH 24/94] add ndk interfaces Signed-off-by: wangqing Change-Id: Iac4334f9f1786eda3e5edbe093a55177a2961021 --- hiviewdfx/hitrace/libhitrace.ndk.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hiviewdfx/hitrace/libhitrace.ndk.json b/hiviewdfx/hitrace/libhitrace.ndk.json index c98632da5..ca73be360 100644 --- a/hiviewdfx/hitrace/libhitrace.ndk.json +++ b/hiviewdfx/hitrace/libhitrace.ndk.json @@ -97,5 +97,29 @@ { "first_introduced": "12", "name": "OH_HiTrace_IdToBytes" + }, + { + "first_introduced": "18", + "name": "OH_HiTrace_StartTraceEx" + }, + { + "first_introduced": "18", + "name": "OH_HiTrace_FinishTraceEx" + }, + { + "first_introduced": "18", + "name": "OH_HiTrace_StartAsyncTraceEx" + }, + { + "first_introduced": "18", + "name": "OH_HiTrace_FinishAsyncTraceEx" + }, + { + "first_introduced": "18", + "name": "OH_HiTrace_CountTraceEx" + }, + { + "first_introduced": "18", + "name": "OH_HiTrace_IsTraceEnabled" } ] \ No newline at end of file -- Gitee From 055d4a438ad40f2bef3726a9e0358e942e760306 Mon Sep 17 00:00:00 2001 From: GMiao522 Date: Mon, 31 Mar 2025 19:59:34 +0800 Subject: [PATCH 25/94] =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BA=9F=E5=BC=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: GMiao522 --- .../graphic_2d/native_drawing/drawing_font_collection.h | 2 ++ .../graphic_2d/native_drawing/drawing_text_typography.h | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/graphic/graphic_2d/native_drawing/drawing_font_collection.h b/graphic/graphic_2d/native_drawing/drawing_font_collection.h index e6ac9f494..f69ef11d2 100644 --- a/graphic/graphic_2d/native_drawing/drawing_font_collection.h +++ b/graphic/graphic_2d/native_drawing/drawing_font_collection.h @@ -72,6 +72,8 @@ void OH_Drawing_DestroyFontCollection(OH_Drawing_FontCollection* fontCollection) * @param fontCollection Indicates the pointer to an OH_Drawing_FontCollection object. * @since 12 * @version 1.0 + * @deprecated since 18 + * @useinstead OH_Drawing_DisableFontCollectionSystemFont */ void OH_Drawing_DisableFontCollectionFallback(OH_Drawing_FontCollection* fontCollection); diff --git a/graphic/graphic_2d/native_drawing/drawing_text_typography.h b/graphic/graphic_2d/native_drawing/drawing_text_typography.h index 966621728..234ceb4c9 100644 --- a/graphic/graphic_2d/native_drawing/drawing_text_typography.h +++ b/graphic/graphic_2d/native_drawing/drawing_text_typography.h @@ -1272,6 +1272,8 @@ size_t OH_Drawing_GetSizeOfTextBox(OH_Drawing_TextBox* textBox); * @return Returns the glyphposition at coordinate. * @since 11 * @version 1.0 + * @deprecated since 18 + * @useinstead OH_Drawing_TypographyGetGlyphPositionAtCoordinateWithCluster */ OH_Drawing_PositionAndAffinity* OH_Drawing_TypographyGetGlyphPositionAtCoordinate(OH_Drawing_Typography* typography, double dx, double dy); @@ -1421,6 +1423,8 @@ void OH_Drawing_SetTextStyleHalfLeading(OH_Drawing_TextStyle* style, bool halfLe * @param ellipsis Indicates the pointer to ellipsis style. * @since 11 * @version 1.0 + * @deprecated since 18 + * @useinstead OH_Drawing_SetTypographyTextEllipsis */ void OH_Drawing_SetTextStyleEllipsis(OH_Drawing_TextStyle* style, const char* ellipsis); @@ -1432,6 +1436,8 @@ void OH_Drawing_SetTextStyleEllipsis(OH_Drawing_TextStyle* style, const char* el * @param ellipsisModal Indicates the ellipsis model to set. For details, see the enum OH_Drawing_EllipsisModal. * @since 11 * @version 1.0 + * @deprecated since 18 + * @useinstead OH_Drawing_SetTypographyTextEllipsisModal */ void OH_Drawing_SetTextStyleEllipsisModal(OH_Drawing_TextStyle* style, int ellipsisModal); @@ -1683,6 +1689,8 @@ OH_Drawing_TextStyle* OH_Drawing_TypographyGetTextStyle(OH_Drawing_TypographySty * @return Returns line text align. * @since 12 * @version 1.0 + * @deprecated since 18 + * @useinstead OH_Drawing_TypographyStyleGetEffectiveAlignment */ int OH_Drawing_TypographyGetEffectiveAlignment(OH_Drawing_TypographyStyle* style); -- Gitee From 5fc8423f42b24ce73d6ac93539dd630550dea229 Mon Sep 17 00:00:00 2001 From: mazhabandeng Date: Tue, 1 Apr 2025 09:23:39 +0800 Subject: [PATCH 26/94] modify annotate Signed-off-by: GQ --- resourceschedule/ffrt/c/queue.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resourceschedule/ffrt/c/queue.h b/resourceschedule/ffrt/c/queue.h index 9d91d12a2..758b79b5a 100644 --- a/resourceschedule/ffrt/c/queue.h +++ b/resourceschedule/ffrt/c/queue.h @@ -98,6 +98,8 @@ FFRT_C_API ffrt_qos_t ffrt_queue_attr_get_qos(const ffrt_queue_attr_t* attr); /** * @brief Sets the execution timeout of a serial queue attribute. * + * The lower limit of timeout value is 1 ms, if the value is less than 1 ms, it will be set to 1 ms. + * * @param attr Serial queue attribute pointer. * @param timeout_us Serial queue task execution timeout. * @since 10 -- Gitee From 6098bc50797d380072ec052dbef4e90a2eb1d046 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Tue, 1 Apr 2025 14:17:02 +0800 Subject: [PATCH 27/94] =?UTF-8?q?Dialog=E7=BB=84=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E8=83=8C=E6=99=AF=E6=A8=A1?= =?UTF-8?q?=E7=B3=8ACAPI=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghang Change-Id: I4e5f326ccc05b3e4fdd41bcd83a72ae2b5423f72 --- arkui/ace_engine/native/native_dialog.h | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arkui/ace_engine/native/native_dialog.h b/arkui/ace_engine/native/native_dialog.h index bedf2c0e7..a9967b8e6 100644 --- a/arkui/ace_engine/native/native_dialog.h +++ b/arkui/ace_engine/native/native_dialog.h @@ -649,6 +649,16 @@ typedef struct { * @note This method must be called before the show method. * @param handle Indicates the pointer to the custom dialog box controller. * @param backgroundBlurStyleOptions Background blur effect options. + * Format of the {@link ArkUI_AttributeItem} parameter: \n + * .value[0].i32: color mode. The value is an enum of {@link ArkUI_ColorMode}. \n + * .value[1]?.i32: adaptive color mode. The value is an enum of {@link ArkUI_AdaptiveColor}. \n + * .value[2]?.f32: blur degree. The value range is [0.0, 1.0]. \n + * .value[3]?.u32: brightness of black in the grayscale blur. The value range is [0, 127]. \n + * .value[4]?.u32: degree of darkening the white color in the grayscale blur. The value range is [0, 127]. \n + * .value[5]?.i32: blur activation policy. The value is an enum of {@link ArkUI_BlurStyleActivePolicy}. \n + * .value[6]?.u32: background color, in 0xARGB format, of the components within the window after the window + * loses focus (in which case, the blur effect on the components within the window is + * removed). \n * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. @@ -663,6 +673,18 @@ typedef struct { * @note This method must be called before the show method. * @param handle Indicates the pointer to the custom dialog box controller. * @param backgroundEffect Background effect. + * Format of the {@link ArkUI_AttributeItem} parameter: \n + * .value[0].f32: blur radius, in vp. \n + * .value[1]?.f32: saturation. \n + * .value[2]?.f32: brightness. \n + * .value[3]?.u32: color, in 0xARGB format. \n + * .value[4]?.i32: adaptive color mode. The value is an enum of {@link ArkUI_AdaptiveColor}. \n + * .value[5]?.u32: brightness of black in the grayscale blur. The value range is [0, 127]. \n + * .value[6]?.u32: degree of darkening the white color in the grayscale blur. The value range is [0, 127]. \n + * .value[7]?.i32: blur activation policy. The value is an enum of {@link ArkUI_BlurStyleActivePolicy}. \n + * .value[8]?.u32: background color, in 0xARGB format, of the components within the window after the window + * loses focus (in which case, the blur effect on the components within the window is + * removed). \n * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. @@ -1119,6 +1141,15 @@ int32_t OH_ArkUI_CustomDialog_RegisterOnDidDisappearCallback( * * @param options Dialog box parameters. * @param backgroundBlurStyleOptions Background blur effect options of the dialog box. + * Format of the {@link ArkUI_AttributeItem} parameter: \n + * .value[0].i32: color mode. The value is an enum of {@link ArkUI_ColorMode}. \n + * .value[1]?.i32: adaptive color mode. The value is an enum of {@link ArkUI_AdaptiveColor}. \n + * .value[2]?.f32: blur degree. The value range is [0.0, 1.0]. \n + * .value[3]?.u32: brightness of black in the grayscale blur. The value range is [0, 127]. \n + * .value[4]?.u32: degree of darkening the white color in the grayscale blur. The value range is [0, 127]. \n + * .value[5]?.i32: blur activation policy. The value is an enum of {@link ArkUI_BlurStyleActivePolicy}. \n + * .value[6]?.u32: background color, in 0xARGB format, of the components within the window after the window loses + * focus (in which case, the blur effect on the components within the window is removed). \n * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. @@ -1132,6 +1163,17 @@ int32_t OH_ArkUI_CustomDialog_SetBackgroundBlurStyleOptions( * * @param options Dialog box parameters. * @param backgroundEffect Background effect of the dialog box. + * Format of the {@link ArkUI_AttributeItem} parameter: \n + * .value[0].f32: blur radius, in vp. \n + * .value[1]?.f32: saturation. \n + * .value[2]?.f32: brightness. \n + * .value[3]?.u32: color, in 0xARGB format. \n + * .value[4]?.i32: adaptive color mode. The value is an enum of {@link ArkUI_AdaptiveColor}. \n + * .value[5]?.u32: brightness of black in the grayscale blur. The value range is [0, 127]. \n + * .value[6]?.u32: degree of darkening the white color in the grayscale blur. The value range is [0, 127]. \n + * .value[7]?.i32: blur activation policy. The value is an enum of {@link ArkUI_BlurStyleActivePolicy}. \n + * .value[8]?.u32: background color, in 0xARGB format, of the components within the window after the window loses + * focus (in which case, the blur effect on the components within the window is removed). \n * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. -- Gitee From 07f0f5ff094e87cacfe8982aba032f1da07e0a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=94=BF?= Date: Tue, 1 Apr 2025 22:44:35 +0800 Subject: [PATCH 28/94] =?UTF-8?q?=E5=A4=9A=E6=91=84=E5=90=8C=E5=BC=80ndk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李政 --- multimedia/camera_framework/camera.h | 51 ++++++++++++++++++++ multimedia/camera_framework/camera_input.h | 14 ++++++ multimedia/camera_framework/camera_manager.h | 33 +++++++++++++ 3 files changed, 98 insertions(+) diff --git a/multimedia/camera_framework/camera.h b/multimedia/camera_framework/camera.h index eecc0d386..b4bb7a619 100644 --- a/multimedia/camera_framework/camera.h +++ b/multimedia/camera_framework/camera.h @@ -1101,6 +1101,57 @@ typedef enum Camera_QualityPrioritization { POWER_BALANCE = 1 } Camera_QualityPrioritization; +/** + * @brief Enum for camera concurrent type. + * + * @since 18 + * @version 1.0 + */ +typedef enum Camera_ConcurrentType { + /** + * Cameras concurrency with limited capability. + */ + CONCURRENT_TYPE_LIMITED_CAPABILITY = 0, + + /** + * Cameras concurrenct with full capability. + */ + CONCURRENT_TYPE_FULL_CAPABILITY = 1 +} Camera_ConcurrentType; + +/** + * @brief Concurrency capability infos. + * + * @since 18 + * @version 1.0 + */ +typedef struct Camera_ConcurrentInfo { + /** + * Camera instance. + */ + Camera_Device camera; + + /** + * Supported concurrent type. + */ + Camera_ConcurrentType type; + + /** + * Supported Modes. + */ + Camera_SceneMode* sceneModes; + + /** + * Supported outputCapabilities + */ + Camera_OutputCapability* outputCapabilities; + + /** + * Supported outputCapabilities size. + */ + uint32_t modeAndCapabilitySize; +} Camera_ConcurrentInfo; + #ifdef __cplusplus } #endif diff --git a/multimedia/camera_framework/camera_input.h b/multimedia/camera_framework/camera_input.h index 1438eda3e..a91452d9d 100644 --- a/multimedia/camera_framework/camera_input.h +++ b/multimedia/camera_framework/camera_input.h @@ -135,6 +135,20 @@ Camera_ErrorCode OH_CameraInput_Open(Camera_Input* cameraInput); */ Camera_ErrorCode OH_CameraInput_OpenSecureCamera(Camera_Input* cameraInput, uint64_t* secureSeqId); +/** + * @brief Open camera with specified concurrent type. + * + * @param cameraInput the {@link Camera_Input} instance to be opened. + * @param type the {@link Camera_ConcurrentType} instance. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * {@link #CAMERA_CONFLICT_CAMERA} if can not use camera cause of conflict. + * {@link #CAMERA_DEVICE_DISABLED} if camera disabled cause of security reason. + * {@link #CAMERA_SERVICE_FATAL_ERROR} if camera service fatal error. + * @since 18 + */ +Camera_ErrorCode OH_CameraInput_OpenConcurrentCameras(Camera_Input* cameraInput, Camera_ConcurrentType type); + /** * @brief Close camera. * diff --git a/multimedia/camera_framework/camera_manager.h b/multimedia/camera_framework/camera_manager.h index 71a8f4616..3523f02b6 100644 --- a/multimedia/camera_framework/camera_manager.h +++ b/multimedia/camera_framework/camera_manager.h @@ -470,6 +470,39 @@ Camera_ErrorCode OH_CameraManager_IsTorchSupportedByTorchMode(Camera_Manager* ca Camera_ErrorCode OH_CameraManager_SetTorchMode(Camera_Manager* cameraManager, Camera_TorchMode torchMode); +/** + * @brief Queries a specified device based on position and type. + * + * @param cameraManager the {@link Camera_Manager} instance. + * @param position the {@link Camera_Position} instance. + * @param type the {@link Camera_Type} instance. + * @param camera the {@link Camera_Device} to be set. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * {@link #CAMERA_SERVICE_FATAL_ERROR} if camera service fatal error. + * @since 18 + */ +Camera_ErrorCode OH_CameraManager_GetCameraDevice(Camera_Manager* cameraManager, Camera_Position position, + Camera_Type type, Camera_Device* camera); + +/** +* @brief Obtains the concurrent information of specified cameras, the empty return means concurrency is not supported. +* +* @param cameraManager the {@link Camera_Manager} instance. +* @param camera the {@link Camera_Device} instance. +* @param deviceSize length of the input device array. +* @param CameraConcurrentInfo the {@link Camera_ConcurrentInfo} to be set. +* @param infoSize length of the returned concurrency information array. +* @return {@link #CAMERA_OK} if the method call succeeds. +* {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. +* {@link #CAMERA_SERVICE_FATAL_ERROR} if camera service fatal error. +* @since 18 +*/ +Camera_ErrorCode OH_CameraManager_GetCameraConcurrentInfos(Camera_Manager* cameraManager, const Camera_Device* camera, + uint32_t deviceSize, + Camera_ConcurrentInfo** cameraConcurrentInfo, + uint32_t* infoSize); + #ifdef __cplusplus } #endif -- Gitee From e536b1fbcdb8cc563b8800550cdfae75260cb88a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=94=BF?= Date: Tue, 1 Apr 2025 23:14:56 +0800 Subject: [PATCH 29/94] xxxx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李政 --- multimedia/camera_framework/camera.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multimedia/camera_framework/camera.h b/multimedia/camera_framework/camera.h index b4bb7a619..274390abd 100644 --- a/multimedia/camera_framework/camera.h +++ b/multimedia/camera_framework/camera.h @@ -1111,12 +1111,12 @@ typedef enum Camera_ConcurrentType { /** * Cameras concurrency with limited capability. */ - CONCURRENT_TYPE_LIMITED_CAPABILITY = 0, + CAMERA_CONCURRENT_TYPE_LIMITED_CAPABILITY = 0, /** * Cameras concurrenct with full capability. */ - CONCURRENT_TYPE_FULL_CAPABILITY = 1 + CAMERA_CONCURRENT_TYPE_FULL_CAPABILITY = 1 } Camera_ConcurrentType; /** -- Gitee From ea54814a8685a2c3aba1859225e074d9b759c691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=94=BF?= Date: Tue, 1 Apr 2025 15:24:42 +0000 Subject: [PATCH 30/94] update multimedia/camera_framework/camera_manager.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李政 --- multimedia/camera_framework/camera_manager.h | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/multimedia/camera_framework/camera_manager.h b/multimedia/camera_framework/camera_manager.h index 3523f02b6..58bbd4db8 100644 --- a/multimedia/camera_framework/camera_manager.h +++ b/multimedia/camera_framework/camera_manager.h @@ -486,22 +486,22 @@ Camera_ErrorCode OH_CameraManager_GetCameraDevice(Camera_Manager* cameraManager, Camera_Type type, Camera_Device* camera); /** -* @brief Obtains the concurrent information of specified cameras, the empty return means concurrency is not supported. -* -* @param cameraManager the {@link Camera_Manager} instance. -* @param camera the {@link Camera_Device} instance. -* @param deviceSize length of the input device array. -* @param CameraConcurrentInfo the {@link Camera_ConcurrentInfo} to be set. -* @param infoSize length of the returned concurrency information array. -* @return {@link #CAMERA_OK} if the method call succeeds. -* {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. -* {@link #CAMERA_SERVICE_FATAL_ERROR} if camera service fatal error. -* @since 18 -*/ + * @brief Obtains the concurrent information of specified cameras, the empty return means concurrency is not supported. + * + * @param cameraManager the {@link Camera_Manager} instance. + * @param camera the {@link Camera_Device} instance. + * @param deviceSize length of the input device array. + * @param cameraConcurrentInfo the {@link Camera_ConcurrentInfo} to be set. + * @param infoSize length of the returned concurrency information array. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * {@link #CAMERA_SERVICE_FATAL_ERROR} if camera service fatal error. + * @since 18 + */ Camera_ErrorCode OH_CameraManager_GetCameraConcurrentInfos(Camera_Manager* cameraManager, const Camera_Device* camera, - uint32_t deviceSize, - Camera_ConcurrentInfo** cameraConcurrentInfo, - uint32_t* infoSize); + uint32_t deviceSize, + Camera_ConcurrentInfo** cameraConcurrentInfo, + uint32_t* infoSize) #ifdef __cplusplus } -- Gitee From 7651b7d0bc03d0f4b5602908ec425cb6314eb503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=94=BF?= Date: Wed, 2 Apr 2025 01:15:15 +0000 Subject: [PATCH 31/94] update multimedia/camera_framework/camera_manager.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李政 --- multimedia/camera_framework/camera_manager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/camera_framework/camera_manager.h b/multimedia/camera_framework/camera_manager.h index 58bbd4db8..68e51c290 100644 --- a/multimedia/camera_framework/camera_manager.h +++ b/multimedia/camera_framework/camera_manager.h @@ -501,7 +501,7 @@ Camera_ErrorCode OH_CameraManager_GetCameraDevice(Camera_Manager* cameraManager, Camera_ErrorCode OH_CameraManager_GetCameraConcurrentInfos(Camera_Manager* cameraManager, const Camera_Device* camera, uint32_t deviceSize, Camera_ConcurrentInfo** cameraConcurrentInfo, - uint32_t* infoSize) + uint32_t* infoSize); #ifdef __cplusplus } -- Gitee From 19e86294c34116b487a53b69c02fde84e6ad6f90 Mon Sep 17 00:00:00 2001 From: lihui Date: Tue, 1 Apr 2025 10:56:31 +0800 Subject: [PATCH 32/94] add surface enum Signed-off-by: lihui --- .../kit_sub_system/c_file_kit_sub_system.json | 1 - .../graphic_2d/native_buffer/native_buffer.h | 4 +- graphic/graphic_2d/native_fence/BUILD.gn | 28 ------ .../native_fence/libnative_fence.ndk.json | 18 ---- .../graphic_2d/native_fence/native_fence.h | 97 ------------------- ndk_targets.gni | 2 - 6 files changed, 2 insertions(+), 148 deletions(-) delete mode 100644 graphic/graphic_2d/native_fence/BUILD.gn delete mode 100644 graphic/graphic_2d/native_fence/libnative_fence.ndk.json delete mode 100644 graphic/graphic_2d/native_fence/native_fence.h diff --git a/build-tools/capi_parser/src/coreImpl/parser/kit_sub_system/c_file_kit_sub_system.json b/build-tools/capi_parser/src/coreImpl/parser/kit_sub_system/c_file_kit_sub_system.json index dcd33f4b7..2e7636057 100644 --- a/build-tools/capi_parser/src/coreImpl/parser/kit_sub_system/c_file_kit_sub_system.json +++ b/build-tools/capi_parser/src/coreImpl/parser/kit_sub_system/c_file_kit_sub_system.json @@ -297,7 +297,6 @@ "kitName": "ArkGraphicsD", "subSystem": "图形图像" }, - { "filePath": "graphic/graphic_2d/native_fence/native_fence.h", "kitName": "NA", "subSystem": "图形图像" }, { "filePath": "third_party/vulkan-headers/vulkan/vk_platform.h", "kitName": "NA", "subSystem": "图形图像" }, { "filePath": "third_party/vulkan-headers/vulkan/vulkan.h", "kitName": "NA", "subSystem": "图形图像" }, { "filePath": "third_party/vulkan-headers/vulkan/vulkan_core.h", "kitName": "NA", "subSystem": "图形图像" }, diff --git a/graphic/graphic_2d/native_buffer/native_buffer.h b/graphic/graphic_2d/native_buffer/native_buffer.h index 734fdc04b..771256ac5 100644 --- a/graphic/graphic_2d/native_buffer/native_buffer.h +++ b/graphic/graphic_2d/native_buffer/native_buffer.h @@ -209,12 +209,12 @@ typedef enum OH_NativeBuffer_Format { */ NATIVEBUFFER_PIXEL_FMT_RGBA16_FLOAT, /** - * RGBA16 Y8 format + * Y8 format * @since 20 */ NATIVEBUFFER_PIXEL_FMT_Y8 = 40, /** - * RGBA16 Y16 format + * Y16 format * @since 20 */ NATIVEBUFFER_PIXEL_FMT_Y16 = 41, diff --git a/graphic/graphic_2d/native_fence/BUILD.gn b/graphic/graphic_2d/native_fence/BUILD.gn deleted file mode 100644 index ac784db3d..000000000 --- a/graphic/graphic_2d/native_fence/BUILD.gn +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) 2025 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") -import("//build/ohos/ndk/ndk.gni") - -ohos_ndk_headers("native_fence_header") { - dest_dir = "$ndk_headers_out_dir/native_fence" - sources = [ "./native_fence.h" ] -} - -ohos_ndk_library("libnative_fence_ndk") { - output_name = "native_fence" - output_extension = "so" - ndk_description_file = "./libnative_fence.ndk.json" - system_capability = "SystemCapability.Graphic.Graphic2D.NativeFence" - system_capability_headers = [ "native_fence/native_fence.h" ] -} diff --git a/graphic/graphic_2d/native_fence/libnative_fence.ndk.json b/graphic/graphic_2d/native_fence/libnative_fence.ndk.json deleted file mode 100644 index b29686ae5..000000000 --- a/graphic/graphic_2d/native_fence/libnative_fence.ndk.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "first_introduced": "20", - "name": "OH_NativeFence_IsValid" - }, - { - "first_introduced": "20", - "name": "OH_NativeFence_Wait" - }, - { - "first_introduced": "20", - "name": "OH_NativeFence_WaitForever" - }, - { - "first_introduced": "20", - "name": "OH_NativeFence_Close" - } -] \ No newline at end of file diff --git a/graphic/graphic_2d/native_fence/native_fence.h b/graphic/graphic_2d/native_fence/native_fence.h deleted file mode 100644 index c43d9c4a5..000000000 --- a/graphic/graphic_2d/native_fence/native_fence.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @addtogroup NativeFence - * @{ - * - * @brief Provides the native fence capability - * - * @syscap SystemCapability.Graphic.Graphic2D.NativeFence - * @since 20 - * @version 1.0 - */ - -/** - * @file native_fence.h - * - * @brief Defines the functions for using native fence. - * - * @kit ArkGraphics2D - * @library libnative_fence.so - * @syscap SystemCapability.Graphic.Graphic2D.NativeFence - * @since 20 - * @version 1.0 - */ - -#ifndef NDK_INCLUDE_NATIVE_FENCE_H_ -#define NDK_INCLUDE_NATIVE_FENCE_H_ - -#include - -#ifdef __cplusplus -extern "C" { -#endif -/** - * @brief Checks if the fence is valid. - * - * @syscap SystemCapability.Graphic.Graphic2D.NativeFence - * @param fenceFd Indicates a file descriptor handle, which is used for timing synchronization. - * @return Returns true means the fence is valid, otherwise, invalid. - * @since 20 - * @version 1.0 - */ -bool OH_NativeFence_IsValid(int fenceFd); - -/** - * @brief Waits for a fence signal. The maximum waiting time is determined by the timeout parameter.\n - * If the fence is invalid, it is equivalent to the fence having signaled, and the function will return true immediately. - * - * @syscap SystemCapability.Graphic.Graphic2D.NativeFence - * @param fenceFd Indicates a file descriptor handle, which is used for timing synchronization. - * @param timeout Indicates the timeout duration. - * @return Returns true if the fence signaled, false otherwise. - * @since 20 - * @version 1.0 - */ -bool OH_NativeFence_Wait(int fenceFd, uint32_t timeout); - -/** - * @brief Waits forever for a fence signal.\n - * If the fence is invalid, it is equivalent to the fence having signaled, and the function will return true immediately. - * - * @syscap SystemCapability.Graphic.Graphic2D.NativeFence - * @param fenceFd Indicates a file descriptor handle, which is used for timing synchronization. - * @return Returns true if the fence signaled, false otherwise. - * @since 20 - * @version 1.0 - */ -bool OH_NativeFence_WaitForever(int fenceFd); - -/** - * @brief Close the fence - * - * @syscap SystemCapability.Graphic.Graphic2D.NativeFence - * @param fenceFd Indicates a file descriptor handle, which is used for timing synchronization. - * @since 20 - * @version 1.0 - */ -void OH_NativeFence_Close(int fenceFd); -#ifdef __cplusplus -} -#endif - -/** @} */ -#endif \ No newline at end of file diff --git a/ndk_targets.gni b/ndk_targets.gni index 114235744..25da4956f 100644 --- a/ndk_targets.gni +++ b/ndk_targets.gni @@ -86,8 +86,6 @@ _ndk_library_targets = [ "//interface/sdk_c/graphic/graphic_2d/native_image:native_image_header", "//interface/sdk_c/graphic/graphic_2d/native_vsync:libnative_vsync_ndk", "//interface/sdk_c/graphic/graphic_2d/native_vsync:native_vsync_header", - "//interface/sdk_c/graphic/graphic_2d/native_fence:libnative_fence_ndk", - "//interface/sdk_c/graphic/graphic_2d/native_fence:native_fence_header", "//interface/sdk_c/graphic/graphic_2d/native_color_space_manager:libnative_color_space_manager_ndk", "//interface/sdk_c/graphic/graphic_2d/native_color_space_manager:native_color_space_manager_header", "//interface/sdk_c/graphic/graphic_2d/native_drawing:libnative_drawing_ndk", -- Gitee From 3d0c57567333eb17ac8c17d78e3c44b1891400c3 Mon Sep 17 00:00:00 2001 From: liukaii Date: Wed, 2 Apr 2025 09:49:31 +0800 Subject: [PATCH 33/94] Add keyboard indicator states in KeyEvent. Signed-off-by: liukaii --- arkui/ace_engine/native/libace.ndk.json | 12 ++++++++ arkui/ace_engine/native/native_key_event.h | 36 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 03fe16880..876d544ea 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3298,5 +3298,17 @@ { "first_introduced": "18", "name": "OH_ArkUI_XComponent_IsInitialized" + }, + { + "first_introduced": "18", + "name": "OH_ArkUI_KeyEvent_IsNumLockOn" + }, + { + "first_introduced": "18", + "name": "OH_ArkUI_KeyEvent_IsCapsLockOn" + }, + { + "first_introduced": "18", + "name": "OH_ArkUI_KeyEvent_IsScrollLockOn" } ] \ No newline at end of file diff --git a/arkui/ace_engine/native/native_key_event.h b/arkui/ace_engine/native/native_key_event.h index a20f0e9b5..34a568953 100644 --- a/arkui/ace_engine/native/native_key_event.h +++ b/arkui/ace_engine/native/native_key_event.h @@ -565,6 +565,42 @@ void OH_ArkUI_KeyEvent_SetConsumed(const ArkUI_UIInputEvent* event, bool isConsu * @since 15 */ void OH_ArkUI_KeyEvent_Dispatch(ArkUI_NodeHandle node, const ArkUI_UIInputEvent* event); + +/** + * @brief Get the Num Lock state of the key event. + * + * @param event Pointer to an ArkUI_UIInputEvent object. + * @param state Return whether the Num Lock is on. + * @return Returns the result code. + * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. + * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. + * @since 18 + */ +ArkUI_ErrorCode OH_ArkUI_KeyEvent_IsNumLockOn(const ArkUI_UIInputEvent* event, bool* state); + +/** + * @brief Get the Caps Lock state of the key event. + * + * @param event Pointer to an ArkUI_UIInputEvent object. + * @param state Return whether the Caps Lock is on. + * @return Returns the result code. + * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. + * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. + * @since 18 + */ +ArkUI_ErrorCode OH_ArkUI_KeyEvent_IsCapsLockOn(const ArkUI_UIInputEvent* event, bool* state); + +/** + * @brief Get the Scroll Lock state of the key event. + * + * @param event Pointer to an ArkUI_UIInputEvent object. + * @param state Return whether the Scroll Lock is on. + * @return Returns the result code. + * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. + * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. + * @since 18 + */ +ArkUI_ErrorCode OH_ArkUI_KeyEvent_IsScrollLockOn(const ArkUI_UIInputEvent* event, bool* state); #ifdef __cplusplus }; #endif -- Gitee From d34f3f37f8448d6288491286f1862ce297c97d50 Mon Sep 17 00:00:00 2001 From: cailei Date: Wed, 2 Apr 2025 11:21:38 +0800 Subject: [PATCH 34/94] =?UTF-8?q?=E8=B0=83=E6=95=B4f32=E7=9A=84api?= =?UTF-8?q?=E4=B8=BA17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cailei --- multimedia/audio_framework/common/native_audiostream_base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/audio_framework/common/native_audiostream_base.h b/multimedia/audio_framework/common/native_audiostream_base.h index 6b1fb6cb6..042f1f3ed 100644 --- a/multimedia/audio_framework/common/native_audiostream_base.h +++ b/multimedia/audio_framework/common/native_audiostream_base.h @@ -136,7 +136,7 @@ typedef enum { /** * Float 32, little endian. * - * @since 18 + * @since 17 */ AUDIOSTREAM_SAMPLE_F32LE = 4, } OH_AudioStream_SampleFormat; -- Gitee From 51bec5fb6bbfc82e2035e6a4b3b535e2c319fbc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=B4=E9=A3=8E?= Date: Sat, 29 Mar 2025 14:59:20 +0800 Subject: [PATCH 35/94] modify api version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨临风 --- .../audio_framework/common/native_audio_device_base.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/multimedia/audio_framework/common/native_audio_device_base.h b/multimedia/audio_framework/common/native_audio_device_base.h index 15a90dac3..17f1b7804 100644 --- a/multimedia/audio_framework/common/native_audio_device_base.h +++ b/multimedia/audio_framework/common/native_audio_device_base.h @@ -158,13 +158,13 @@ typedef enum { /** * @brief HDMI device, such as a device connected through an HDMI, ARC, or eARC interface. - * @since 18 + * @since 19 */ AUDIO_DEVICE_TYPE_HDMI = 27, /** - * @brief line-connected, digital audio output device, such as an S/PDIF device. - * @since 18 + * @brief Line-connected, digital audio output device, such as an S/PDIF device. + * @since 19 */ AUDIO_DEVICE_TYPE_LINE_DIGITAL = 28, -- Gitee From 3352189fc6800240c1917b78e12d40cac32ed902 Mon Sep 17 00:00:00 2001 From: wangbowen36 Date: Wed, 2 Apr 2025 17:41:51 +0800 Subject: [PATCH 36/94] Interface export napi_onLoad Issue: https://gitee.com/openharmony/interface_sdk_c/issues/IBYCCH Signed-off-by: wangbowen36 --- arkui/napi/libnapi.ndk.json | 4 ++++ arkui/napi/native_api.h | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/arkui/napi/libnapi.ndk.json b/arkui/napi/libnapi.ndk.json index 04e3cc6d4..e9bb3b056 100644 --- a/arkui/napi/libnapi.ndk.json +++ b/arkui/napi/libnapi.ndk.json @@ -242,5 +242,9 @@ { "first_introduced": "18", "name": "napi_wrap_enhance" + }, + { + "first_introduced": "17", + "name": "napi_onLoad" } ] diff --git a/arkui/napi/native_api.h b/arkui/napi/native_api.h index c1dd962f8..788a6df98 100644 --- a/arkui/napi/native_api.h +++ b/arkui/napi/native_api.h @@ -1639,6 +1639,13 @@ NAPI_EXTERN napi_status napi_define_class(napi_env env, size_t property_count, const napi_property_descriptor* properties, napi_value* result); + +/** + * @brief To load native libraries and this interface is defined in native libraries. + * + * @since 17 + */ +NAPI_EXTERN void napi_onLoad(); #ifdef __cplusplus } #endif -- Gitee From c78d384ac64224e73c7bc3429985c6500f4f4e8e Mon Sep 17 00:00:00 2001 From: zhanghongran Date: Wed, 2 Apr 2025 20:01:01 +0800 Subject: [PATCH 37/94] modify API version Signed-off-by: zhanghongran --- multimedia/av_codec/native_avcodec_base.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index ab39d8e31..609dc238e 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -366,14 +366,14 @@ extern const char *OH_AVCODEC_MIMETYPE_AUDIO_RAW; * @brief Enumerates the MIME type of video mpeg2 codec. * * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 18 + * @since 17 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG2; /** * @brief Enumerates the MIME type of video mpeg4 part2 codec. * * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 18 + * @since 17 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4_PART2; @@ -381,7 +381,7 @@ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_MPEG4_PART2; * @brief Enumerates the MIME type of video h263 codec. * * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 18 + * @since 17 */ extern const char *OH_AVCODEC_MIMETYPE_VIDEO_H263; @@ -1144,7 +1144,7 @@ typedef enum OH_VVCProfile { * @brief MPEG2 Profile * * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 18 + * @since 17 */ typedef enum OH_MPEG2Profile { /** Simple profile */ @@ -1165,7 +1165,7 @@ typedef enum OH_MPEG2Profile { * @brief MPEG4 Profile * * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 18 + * @since 17 */ typedef enum OH_MPEG4Profile { /** Simple profile */ @@ -1204,7 +1204,7 @@ typedef enum OH_MPEG4Profile { * @brief H263 Profile * * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 18 + * @since 17 */ typedef enum OH_H263Profile { /** Baseline profile */ @@ -1465,7 +1465,7 @@ typedef enum OH_VVCLevel { * @brief MPEG2 Level. * * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 18 + * @since 17 */ typedef enum OH_MPEG2Level { /** Low level */ @@ -1482,7 +1482,7 @@ typedef enum OH_MPEG2Level { * @brief MPEG4 Level. * * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 18 + * @since 17 */ typedef enum OH_MPEG4Level { /** 0 level */ @@ -1511,7 +1511,7 @@ typedef enum OH_MPEG4Level { * @brief H263 Level. * * @syscap SystemCapability.Multimedia.Media.CodecBase - * @since 18 + * @since 17 */ typedef enum OH_H263Level { /** 10 level */ -- Gitee From b52d7490b3b994612b6f3ee47f6d5cfbe9c2bf44 Mon Sep 17 00:00:00 2001 From: cheerful_ricky Date: Wed, 2 Apr 2025 14:47:27 +0800 Subject: [PATCH 38/94] add new error code for publish api Signed-off-by: cheerful_ricky --- BasicServicesKit/commonevent/oh_commonevent.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/BasicServicesKit/commonevent/oh_commonevent.h b/BasicServicesKit/commonevent/oh_commonevent.h index a5b93c498..ea252db50 100644 --- a/BasicServicesKit/commonevent/oh_commonevent.h +++ b/BasicServicesKit/commonevent/oh_commonevent.h @@ -59,6 +59,13 @@ typedef enum CommonEvent_ErrCode { /** @error invalid input parameter. */ COMMONEVENT_ERR_INVALID_PARAMETER = 401, + /** + * @error The common event send frequency too high. + * + * @since 19 + */ + COMMONEVENT_ERR_SENDING_LIMIT_EXCEEDED = 1500003, + /** @error the application cannot send system common events. */ COMMONEVENT_ERR_NOT_SYSTEM_SERVICE = 1500004, @@ -627,6 +634,7 @@ CommonEvent_ErrCode OH_CommonEvent_SetDoubleArrayToParameters(CommonEvent_Parame * @return Returns the error code. * Returns {@link COMMONEVENT_ERR_OK} if the operation is successful. * Returns {@link COMMONEVENT_ERR_INVALID_PARAMETER} if a parameter error occurs. + * Returns {@link COMMONEVENT_ERR_SENDING_LIMIT_EXCEEDED} if the common event sending frequency too high. * Returns {@link COMMONEVENT_ERR_FAIL_SEND_REQUEST } if IPC request failed to send. * Returns {@link COMMONEVENT_ERR_INIT_UNDONE } if ces not init done. * @since 18 @@ -641,6 +649,7 @@ CommonEvent_ErrCode OH_CommonEvent_Publish(const char* event); * @return Returns the error code. * Returns {@link COMMONEVENT_ERR_OK} if the operation is successful. * Returns {@link COMMONEVENT_ERR_INVALID_PARAMETER} if a parameter error occurs. + * Returns {@link COMMONEVENT_ERR_SENDING_LIMIT_EXCEEDED} if the common event sending frequency too high. * Returns {@link COMMONEVENT_ERR_FAIL_SEND_REQUEST } if IPC request failed to send. * Returns {@link COMMONEVENT_ERR_INIT_UNDONE } if ces not init done. * @since 18 -- Gitee From ab5e389cc4fee3fc6b1ca4a925d21b833e3a580a Mon Sep 17 00:00:00 2001 From: wangz Date: Thu, 3 Apr 2025 10:29:51 +0800 Subject: [PATCH 39/94] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangz --- .../background_process_manager.ndk.json | 4 ++-- .../include/background_process_manager.h | 20 ++++++------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/resourceschedule/background_process_manager/background_process_manager.ndk.json b/resourceschedule/background_process_manager/background_process_manager.ndk.json index 022e94975..db04aecf1 100644 --- a/resourceschedule/background_process_manager/background_process_manager.ndk.json +++ b/resourceschedule/background_process_manager/background_process_manager.ndk.json @@ -1,10 +1,10 @@ [ { - "first_introduced": "15", + "first_introduced": "17", "name": "OH_BackgroundProcessManager_SetProcessPriority" }, { - "first_introduced": "15", + "first_introduced": "17", "name": "OH_BackgroundProcessManager_ResetProcessPriority" } ] \ No newline at end of file diff --git a/resourceschedule/background_process_manager/include/background_process_manager.h b/resourceschedule/background_process_manager/include/background_process_manager.h index c9e3c085c..0a3d87dc4 100644 --- a/resourceschedule/background_process_manager/include/background_process_manager.h +++ b/resourceschedule/background_process_manager/include/background_process_manager.h @@ -19,7 +19,7 @@ * * @brief BackgroundProcessManager provides APIs. * - * @since 15 + * @since 17 */ /** @@ -32,7 +32,7 @@ * @library libbackground_process_manager.z.so * @kit BackgroundTasksKit * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager - * @since 15 + * @since 17 */ #ifndef RESOURCESCHEDULE_BACKGROUND_PROCESS_MANAGER_H @@ -45,7 +45,7 @@ extern "C" { /** * @brief Describes the level of BackgroundProcessManager priority. * - * @since 15 + * @since 17 */ typedef enum BackgroundProcessManager_ProcessPriority { /** @@ -62,7 +62,7 @@ typedef enum BackgroundProcessManager_ProcessPriority { /** * @brief Enum for BackgroundProcessManager error code. * - * @since 15 + * @since 17 */ typedef enum BackgroundProcessManager_ErrorCode { /** @@ -75,12 +75,6 @@ typedef enum BackgroundProcessManager_ErrorCode { * 1. priority is out of range. */ ERR_BACKGROUND_PROCESS_MANAGER_INVALID_PARAM = 401, - - /** - * @error remote error. Possible causes: - * 1. remote is not work. - */ - ERR_BACKGROUND_PROCESS_MANAGER_REMOTE_ERROR = 31800001, } BackgroundProcessManager_ErrorCode; /** @@ -91,8 +85,7 @@ typedef enum BackgroundProcessManager_ErrorCode { Specific priority can be referenced {@link BackgroundProcessManager_ProcessPriority}. * @return {@link ERR_BACKGROUND_PROCESS_MANAGER_SUCCESS} 0 - Success. * {@link ERR_BACKGROUND_PROCESS_MANAGER_INVALID_PARAM} 401 - Parameter error. - * {@link ERR_BACKGROUND_PROCESS_MANAGER_REMOTE_ERROR} 31800001 - Remote error. - * @since 15 + * @since 17 */ int OH_BackgroundProcessManager_SetProcessPriority(int pid, BackgroundProcessManager_ProcessPriority priority); @@ -101,8 +94,7 @@ int OH_BackgroundProcessManager_SetProcessPriority(int pid, BackgroundProcessMan * * @param pid Indicates the pid of the process to be reset. * @return {@link ERR_BACKGROUND_PROCESS_MANAGER_SUCCESS} 0 - Success. - * {@link ERR_BACKGROUND_PROCESS_MANAGER_REMOTE_ERROR} 31800001 - Remote error. - * @since 15 + * @since 17 */ int OH_BackgroundProcessManager_ResetProcessPriority(int pid); #ifdef __cplusplus -- Gitee From 9a67bf20b0a856d9900693252176be621b939233 Mon Sep 17 00:00:00 2001 From: yang-junfeng0621 Date: Thu, 3 Apr 2025 11:31:44 +0800 Subject: [PATCH 40/94] =?UTF-8?q?OH=5FHuks=5FListAliases=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang-junfeng0621 --- security/huks/include/native_huks_api.h | 1 - 1 file changed, 1 deletion(-) diff --git a/security/huks/include/native_huks_api.h b/security/huks/include/native_huks_api.h index 3e885d3f5..9f0146e09 100644 --- a/security/huks/include/native_huks_api.h +++ b/security/huks/include/native_huks_api.h @@ -449,7 +449,6 @@ struct OH_Huks_Result OH_Huks_AbortSession(const struct OH_Huks_Blob *handle, * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_COMMUNICATION_FAIL} 12000005 - If Ipc commuication failed. * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_INSUFFICIENT_MEMORY} 12000014 - If the memory is insufficient. * @since 12 - * @version 1.0 */ struct OH_Huks_Result OH_Huks_ListAliases(const struct OH_Huks_ParamSet *paramSet, struct OH_Huks_KeyAliasSet **outData); -- Gitee From 46b8380c79cc3d806ff8bb4240f5fe59c2d5af4c Mon Sep 17 00:00:00 2001 From: wangz Date: Thu, 3 Apr 2025 12:36:43 +0800 Subject: [PATCH 41/94] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=9B=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangz --- .../include/background_process_manager.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resourceschedule/background_process_manager/include/background_process_manager.h b/resourceschedule/background_process_manager/include/background_process_manager.h index 0a3d87dc4..b2049aaad 100644 --- a/resourceschedule/background_process_manager/include/background_process_manager.h +++ b/resourceschedule/background_process_manager/include/background_process_manager.h @@ -75,6 +75,12 @@ typedef enum BackgroundProcessManager_ErrorCode { * 1. priority is out of range. */ ERR_BACKGROUND_PROCESS_MANAGER_INVALID_PARAM = 401, + + /** + * @error remote error. Possible causes: + * 1. remote is not work. + */ + ERR_BACKGROUND_PROCESS_MANAGER_REMOTE_ERROR = 31800001, } BackgroundProcessManager_ErrorCode; /** -- Gitee From 2bedb6fcd5896afecef9740904c2415d297ff47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyang-wenxingg=E2=80=9D?= Date: Thu, 3 Apr 2025 16:56:38 +0800 Subject: [PATCH 42/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “yang-wenxingg” --- arkui/window_manager/oh_window_event_filter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkui/window_manager/oh_window_event_filter.h b/arkui/window_manager/oh_window_event_filter.h index 56a726525..5d8aa0dbf 100644 --- a/arkui/window_manager/oh_window_event_filter.h +++ b/arkui/window_manager/oh_window_event_filter.h @@ -14,7 +14,7 @@ */ /** - * @addtogroup WindowManager_NativeModule + * @addtogroup WindowManager * @{ * * @brief Provides abilities of windowManager on the native side, such as key event -- Gitee From 4a08d43a96a4856b89b3fb0b2de60a2129314d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B0=B8=E5=87=AF?= Date: Thu, 3 Apr 2025 17:01:13 +0800 Subject: [PATCH 43/94] change api MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘永凯 --- arkui/ace_engine/native/libace.ndk.json | 2 +- arkui/ace_engine/native/ui_input_event.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 876d544ea..cd3722c92 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -508,7 +508,7 @@ "name": "OH_ArkUI_PointerEvent_GetTiltY" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_ArkUI_PointerEvent_GetRollAngle" }, { diff --git a/arkui/ace_engine/native/ui_input_event.h b/arkui/ace_engine/native/ui_input_event.h index d7de35d36..975d84df1 100644 --- a/arkui/ace_engine/native/ui_input_event.h +++ b/arkui/ace_engine/native/ui_input_event.h @@ -513,7 +513,7 @@ float OH_ArkUI_PointerEvent_GetTiltY(const ArkUI_UIInputEvent* event, uint32_t p * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 18 + * @since 17 */ int32_t OH_ArkUI_PointerEvent_GetRollAngle(const ArkUI_UIInputEvent* event, double* rollAngle); -- Gitee From af5854520a4e180c02b3b870617a783762d46933 Mon Sep 17 00:00:00 2001 From: liyongzhuang Date: Sun, 6 Apr 2025 09:36:52 +0000 Subject: [PATCH 44/94] =?UTF-8?q?api=E6=B3=A8=E9=87=8A=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liyongzhuang --- .../interfaces/native/native_interface_arkweb.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/webview/interfaces/native/native_interface_arkweb.h b/web/webview/interfaces/native/native_interface_arkweb.h index 9f8127988..7d40e22df 100644 --- a/web/webview/interfaces/native/native_interface_arkweb.h +++ b/web/webview/interfaces/native/native_interface_arkweb.h @@ -69,7 +69,7 @@ typedef void (*NativeArkWeb_OnValidCallback)(const char*); */ typedef void (*NativeArkWeb_OnDestroyCallback)(const char*); -/* +/** * @brief Loads a piece of code and execute JS code in the context of the currently displayed page. * * @param webTag The name of the web component. @@ -81,7 +81,7 @@ typedef void (*NativeArkWeb_OnDestroyCallback)(const char*); */ void OH_NativeArkWeb_RunJavaScript(const char* webTag, const char* jsCode, NativeArkWeb_OnJavaScriptCallback callback); -/* +/** * @brief Registers the JavaScript object and method list. * * @param webTag The name of the web component. @@ -97,7 +97,7 @@ void OH_NativeArkWeb_RunJavaScript(const char* webTag, const char* jsCode, Nativ void OH_NativeArkWeb_RegisterJavaScriptProxy(const char* webTag, const char* objName, const char** methodList, NativeArkWeb_OnJavaScriptProxyCallback* callback, int32_t size, bool needRefresh); -/* +/** * @brief Deletes the registered object which th given name. * * @param webTag The name of the web component. @@ -108,7 +108,7 @@ void OH_NativeArkWeb_RegisterJavaScriptProxy(const char* webTag, const char* obj */ void OH_NativeArkWeb_UnregisterJavaScriptProxy(const char* webTag, const char* objName); -/* +/** * @brief Registers the valid callback. * * @param webTag The name of the web component. @@ -119,7 +119,7 @@ void OH_NativeArkWeb_UnregisterJavaScriptProxy(const char* webTag, const char* o */ void OH_NativeArkWeb_SetJavaScriptProxyValidCallback(const char* webTag, NativeArkWeb_OnValidCallback callback); -/* +/** * @brief Get the valid callback. * * @param webTag The name of the web component. -- Gitee From 6915c31f17f698ae770874619bbf4baa5f0874d7 Mon Sep 17 00:00:00 2001 From: liujiaxing19 Date: Mon, 31 Mar 2025 16:52:08 +0800 Subject: [PATCH 45/94] =?UTF-8?q?hiappevent=E6=8E=A5=E5=8F=A3=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=B8=80=E8=87=B4=E6=80=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liujiaxing19 Change-Id: I0db1c391b651028d312a0d2fc1128165154f40e7 --- .../hiappevent/include/hiappevent/hiappevent.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hiviewdfx/hiappevent/include/hiappevent/hiappevent.h b/hiviewdfx/hiappevent/include/hiappevent/hiappevent.h index 817691bb2..8ea6331c1 100644 --- a/hiviewdfx/hiappevent/include/hiappevent/hiappevent.h +++ b/hiviewdfx/hiappevent/include/hiappevent/hiappevent.h @@ -152,7 +152,6 @@ enum EventType { * @brief The HiAppEvent_AppEventInfo structure is used to represent event information in an application, including * the event's domain, name, type, and parameters. * - * @SystemCapability.HiviewDFX.HiAppEvent * @since 12 * @version 1.0 */ @@ -221,7 +220,6 @@ typedef struct HiAppEvent_Config HiAppEvent_Config; * @brief The OH_HiAppEvent_OnReceive function acts as the callback function for the HiAppEvent_Watcher. It is called * when an event occurs. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param domain The domain of the event. * @param appEventGroups The event group by the domain. * @param groupLen The length of appEventGroups array. @@ -234,7 +232,6 @@ typedef void (*OH_HiAppEvent_OnReceive)( /** * @brief Called when watcher receive the event meet the condition. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param row The row of events received by watcher. * @param size The size of events received by watcher. * @since 12 @@ -245,7 +242,6 @@ typedef void (*OH_HiAppEvent_OnTrigger)(int row, int size); /** * @brief Called when watcher take the events. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param events The event json string array. * @param eventLen The length of events array. * @since 12 @@ -517,7 +513,6 @@ bool OH_HiAppEvent_Configure(const char* name, const char* value); /** * @brief Create a HiAppEvent_Watcher handler pointer to set the property. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param name The name of the watcher. * @return Returns a pointer to the HiAppEvent_Watcher instance. * @since 12 @@ -528,7 +523,6 @@ HiAppEvent_Watcher* OH_HiAppEvent_CreateWatcher(const char* name); /** * @brief Destroy the specified HiAppEvent_Watcher handle resource. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param watcher The pointer to the HiAppEvent_Watcher instance. * @since 12 * @version 1.0 @@ -540,7 +534,6 @@ void OH_HiAppEvent_DestroyWatcher(HiAppEvent_Watcher* watcher); * interface and any of the condition which is set over than 0 met, the onTrigger callback set through * OH_HiAppEvent_SetWatcherOnTrigger will be invoked. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param watcher The pointer to the HiAppEvent_Watcher instance. * @param row The row of write events that trigger the onTrigger callback. * @param size The size of write events that trigger the onTrigger callback. @@ -557,7 +550,6 @@ int OH_HiAppEvent_SetTriggerCondition(HiAppEvent_Watcher* watcher, int row, int /** * @brief The interface to set the AppEventFilter which defines the kind of app events will be received by the watcher. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param watcher The pointer to the HiAppEvent_Watcher instance. * @param domain The name of the event domain to be monitored by the watcher. * @param eventTypes The types of the events to be monitored by the watcher.0x08 means BEHAVIOR,0x04 means @@ -581,7 +573,6 @@ int OH_HiAppEvent_SetAppEventFilter(HiAppEvent_Watcher* watcher, const char* dom * to nullptr, the app events received by the watcher will be saved. When the new saved appEvents met the conditions set * by OH_HiAppEvent_SetTriggerCondition, the onTrigger callback will be invoked. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param watcher The pointer to the HiAppEvent_Watcher instance. * @param onTrigger The callback of the watcher. * @return Returns 0 if set OnTrigger is successful, and returns a @@ -597,7 +588,6 @@ int OH_HiAppEvent_SetWatcherOnTrigger(HiAppEvent_Watcher* watcher, OH_HiAppEvent * @brief The interface to set onReceive callback for watcher. When the watcher received an app event, the onReceive * callback set will be invoked. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param watcher The pointer to the HiAppEvent_Watcher instance. * @param onReceive The callback of the watcher. * @return Returns 0 if set OnReceive is successful, and returns a @@ -612,7 +602,6 @@ int OH_HiAppEvent_SetWatcherOnReceive(HiAppEvent_Watcher* watcher, OH_HiAppEvent /** * @brief The interface to take saved events data for the watcher. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param watcher The pointer to the HiAppEvent_Watcher instance. * @param eventNum The num of events to take. * @param onTake The callback of the watcher. @@ -629,7 +618,6 @@ int OH_HiAppEvent_TakeWatcherData(HiAppEvent_Watcher* watcher, uint32_t eventNum /** * @brief The interface to add the watcher. The watcher will start receiving app events after it is added. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param watcher The pointer to the HiAppEvent_Watcher instance which receive the event. * @return Returns 0 if add watcher is successful, and returns a * negative integer if add fail. @@ -643,7 +631,6 @@ int OH_HiAppEvent_AddWatcher(HiAppEvent_Watcher* watcher); /** * @brief The interface to remove the watcher. The watcher will stop receiving app events after it is removed. * - * @SystemCapability.HiviewDFX.HiAppEvent * @param watcher The pointer to the HiAppEvent_Watcher instance. * @return Returns 0 if remove watcher is successful, and returns a * negative integer if remove fail. @@ -658,7 +645,6 @@ int OH_HiAppEvent_RemoveWatcher(HiAppEvent_Watcher* watcher); /** * @brief Clear all local saved event data of the application. * - * @SystemCapability.HiviewDFX.HiAppEvent * @since 12 * @version 1.0 */ -- Gitee From e4fb98954f8ffb877e4dc2158d2927af8af4b999 Mon Sep 17 00:00:00 2001 From: zhanghongran Date: Mon, 7 Apr 2025 20:57:18 +0800 Subject: [PATCH 46/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghongran --- .../av_codec/codec_base/libnative_media_codecbase.ndk.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json b/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json index 2dc000e34..8077a4119 100644 --- a/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json +++ b/multimedia/av_codec/codec_base/libnative_media_codecbase.ndk.json @@ -80,15 +80,15 @@ "name": "OH_AVCODEC_MIMETYPE_AUDIO_RAW" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AVCODEC_MIMETYPE_VIDEO_MPEG2" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AVCODEC_MIMETYPE_VIDEO_MPEG4_PART2" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AVCODEC_MIMETYPE_VIDEO_H263" }, { -- Gitee From b7ae81a4049079483c68b9be8b078a513321158a Mon Sep 17 00:00:00 2001 From: hct95 Date: Tue, 25 Mar 2025 10:51:29 +0800 Subject: [PATCH 47/94] =?UTF-8?q?=E6=96=B0=E5=A2=9Epan=E6=89=8B=E5=8A=BFca?= =?UTF-8?q?pi=E4=B8=ADdistanceMap=E7=9A=84=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hct95 --- arkui/ace_engine/native/libace.ndk.json | 8 ++++++ arkui/ace_engine/native/native_gesture.h | 33 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 876d544ea..cf9be3b31 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3310,5 +3310,13 @@ { "first_introduced": "18", "name": "OH_ArkUI_KeyEvent_IsScrollLockOn" + }, + { + "first_introduced": "18", + "name": "OH_ArkUI_PanGesture_SetDistanceMap" + }, + { + "first_introduced": "18", + "name": "OH_ArkUI_PanGesture_GetDistanceByToolType" } ] \ No newline at end of file diff --git a/arkui/ace_engine/native/native_gesture.h b/arkui/ace_engine/native/native_gesture.h index edfafda42..f8dbf864a 100644 --- a/arkui/ace_engine/native/native_gesture.h +++ b/arkui/ace_engine/native/native_gesture.h @@ -835,6 +835,39 @@ int32_t OH_ArkUI_GetGestureParam_angle(ArkUI_GestureRecognizer* recognizer, doub */ int32_t OH_ArkUI_GetGestureParam_distanceThreshold(ArkUI_GestureRecognizer* recognizer, double* distanceThreshold); +/** +* @brief Sets the minimum movement distance thresholds for gestures to be recognized by a gesture recognizer. +* +* @param recognizer Indicates the pointer to a gesture recognizer. +* @param size Size of the array of minimum movement distance thresholds. +* @param toolTypeArray Pointer to the array of tool types for which thresholds are set. +* @param distanceArray Pointer to the array of minimum movement distances. +* @return Returns the result code. +* Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. +* Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. +* Returns {@link ARKUI_ERROR_CODE_RECOGNIZER_TYPE_NOT_SUPPORTED} if the gesture recognizer type is +* not supported. +* @since 18 +*/ +ArkUI_ErrorCode OH_ArkUI_PanGesture_SetDistanceMap( + ArkUI_GestureRecognizer* recognizer, int size, int* toolTypeArray, double* distanceArray); + +/** +* @brief Obtains the movement threshold for gestures to be recognized by a gesture recognizer for a specific tool type. +* +* @param recognizer Indicates the pointer to a gesture recognizer. +* @param toolType Tool type for which you want to obtain the threshold. +* @param distance Gesture movement threshold of the gesture recognizer. +* @return Returns the result code. +* Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. +* Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter exception occurs. +* Returns {@link ARKUI_ERROR_CODE_RECOGNIZER_TYPE_NOT_SUPPORTED} if the gesture recognizer type is +* not supported. +* @since 18 +*/ +ArkUI_ErrorCode OH_ArkUI_PanGesture_GetDistanceByToolType( + ArkUI_GestureRecognizer* recognizer, int toolType, double* distance); + /** * @brief Defines the gesture APIs. * -- Gitee From 820d7f1fbd718629dcbb14e64e1ca80b3279db1c Mon Sep 17 00:00:00 2001 From: yang-junfeng0621 Date: Tue, 8 Apr 2025 10:25:05 +0800 Subject: [PATCH 48/94] =?UTF-8?q?OH=5FHuks=5FListAliases=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang-junfeng0621 --- security/huks/include/native_huks_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/huks/include/native_huks_api.h b/security/huks/include/native_huks_api.h index 9f0146e09..9c9043cdf 100644 --- a/security/huks/include/native_huks_api.h +++ b/security/huks/include/native_huks_api.h @@ -448,7 +448,7 @@ struct OH_Huks_Result OH_Huks_AbortSession(const struct OH_Huks_Blob *handle, * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_INTERNAL_ERROR} 12000012 - If system error ocurred. * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_COMMUNICATION_FAIL} 12000005 - If Ipc commuication failed. * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_INSUFFICIENT_MEMORY} 12000014 - If the memory is insufficient. - * @since 12 + * @since 18 */ struct OH_Huks_Result OH_Huks_ListAliases(const struct OH_Huks_ParamSet *paramSet, struct OH_Huks_KeyAliasSet **outData); -- Gitee From c8458d52eb6d5d1f590c3aabc48d1b1ed7bbf660 Mon Sep 17 00:00:00 2001 From: hanchenZz Date: Tue, 8 Apr 2025 14:29:33 +0800 Subject: [PATCH 49/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9OH=5FAbility=5FGetCurre?= =?UTF-8?q?ntChildProcessArgs=E7=9A=84api=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hanchenZz --- ability/ability_runtime/child_process/libchild_process.ndk.json | 2 +- ability/ability_runtime/child_process/native_child_process.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ability/ability_runtime/child_process/libchild_process.ndk.json b/ability/ability_runtime/child_process/libchild_process.ndk.json index d812f5a08..6f6bdcebf 100644 --- a/ability/ability_runtime/child_process/libchild_process.ndk.json +++ b/ability/ability_runtime/child_process/libchild_process.ndk.json @@ -8,7 +8,7 @@ "name": "OH_Ability_StartNativeChildProcess" }, { - "first_introduced": "16", + "first_introduced": "17", "name": "OH_Ability_GetCurrentChildProcessArgs" } ] \ No newline at end of file diff --git a/ability/ability_runtime/child_process/native_child_process.h b/ability/ability_runtime/child_process/native_child_process.h index 283710400..ca195fdef 100644 --- a/ability/ability_runtime/child_process/native_child_process.h +++ b/ability/ability_runtime/child_process/native_child_process.h @@ -284,7 +284,7 @@ Ability_NativeChildProcess_ErrCode OH_Ability_StartNativeChildProcess( * * @return Returns a pointer to the arguments passed to current child process.\n * For details, see {@link NativeChildProcess_Args}. - * @since 16 + * @since 17 */ NativeChildProcess_Args* OH_Ability_GetCurrentChildProcessArgs(); -- Gitee From f8af1b44a55cc15b4eda7a6bfb162d48dac5cfd4 Mon Sep 17 00:00:00 2001 From: niyisheng Date: Tue, 8 Apr 2025 17:10:12 +0800 Subject: [PATCH 50/94] add flag description Signed-off-by: niyisheng --- DataProtectionKit/dlp_permission_api.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/DataProtectionKit/dlp_permission_api.h b/DataProtectionKit/dlp_permission_api.h index 40ec9c347..738d90e73 100644 --- a/DataProtectionKit/dlp_permission_api.h +++ b/DataProtectionKit/dlp_permission_api.h @@ -86,6 +86,18 @@ typedef enum { * * @param dlpFileAccess - Indicates the access permission for the DLP file. * @param flags - Indicates the actions allowed for the DLP file. + * 0x00000000 - No file permissions.\n + * 0x00000001 - File view permission.\n + * 0x00000002 - File save permission.\n + * 0x00000004 - File save-as permission.\n + * 0x00000008 - File edit permission.\n + * 0x00000010 - File screenshot permission.\n + * 0x00000020 - File screen-sharing permission.\n + * 0x00000040 - File screen-recording permission.\n + * 0x00000080 - File copy permission.\n + * 0x00000100 - File print permission.\n + * 0x00000200 - File export permission.\n + * 0x00000400 - File permission modification permission. * @return {@link DLP_ErrCode#ERR_OH_SUCCESS} 0 - If the operation is successful. * {@link DLP_ErrCode#ERR_OH_INVALID_PARAMETER} 19100001 - If the parameter value is invalid. * {@link DLP_ErrCode#ERR_OH_API_ONLY_FOR_SANDBOX} 19100006 - If no permission to -- Gitee From 14bb60d0c9b07f33d4b83ea7501fc3850613a784 Mon Sep 17 00:00:00 2001 From: niyisheng Date: Tue, 8 Apr 2025 17:33:51 +0800 Subject: [PATCH 51/94] add flag description Signed-off-by: niyisheng --- DataProtectionKit/dlp_permission_api.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/DataProtectionKit/dlp_permission_api.h b/DataProtectionKit/dlp_permission_api.h index 738d90e73..7033efee1 100644 --- a/DataProtectionKit/dlp_permission_api.h +++ b/DataProtectionKit/dlp_permission_api.h @@ -86,17 +86,17 @@ typedef enum { * * @param dlpFileAccess - Indicates the access permission for the DLP file. * @param flags - Indicates the actions allowed for the DLP file. - * 0x00000000 - No file permissions.\n - * 0x00000001 - File view permission.\n - * 0x00000002 - File save permission.\n - * 0x00000004 - File save-as permission.\n - * 0x00000008 - File edit permission.\n - * 0x00000010 - File screenshot permission.\n - * 0x00000020 - File screen-sharing permission.\n - * 0x00000040 - File screen-recording permission.\n - * 0x00000080 - File copy permission.\n - * 0x00000100 - File print permission.\n - * 0x00000200 - File export permission.\n + * 0x00000000 - No file permissions. + * 0x00000001 - File view permission. + * 0x00000002 - File save permission. + * 0x00000004 - File save-as permission. + * 0x00000008 - File edit permission. + * 0x00000010 - File screenshot permission. + * 0x00000020 - File screen-sharing permission. + * 0x00000040 - File screen-recording permission. + * 0x00000080 - File copy permission. + * 0x00000100 - File print permission. + * 0x00000200 - File export permission. * 0x00000400 - File permission modification permission. * @return {@link DLP_ErrCode#ERR_OH_SUCCESS} 0 - If the operation is successful. * {@link DLP_ErrCode#ERR_OH_INVALID_PARAMETER} 19100001 - If the parameter value is invalid. -- Gitee From cb25579f9f895cdd9a1a3f01959618cfcc56fac2 Mon Sep 17 00:00:00 2001 From: bjd Date: Wed, 9 Apr 2025 09:37:00 +0800 Subject: [PATCH 52/94] =?UTF-8?q?icu=E7=89=B9=E6=80=A7=E5=9B=9E=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- .../relational_store/include/relational_store.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distributeddatamgr/relational_store/include/relational_store.h b/distributeddatamgr/relational_store/include/relational_store.h index 54d2cc405..9ccf570f2 100644 --- a/distributeddatamgr/relational_store/include/relational_store.h +++ b/distributeddatamgr/relational_store/include/relational_store.h @@ -190,7 +190,7 @@ typedef enum Rdb_DBType { /** * @brief Define Rdb_Tokenizer type. * - * @since 18 + * @since 17 */ typedef enum Rdb_Tokenizer { /** @@ -341,7 +341,7 @@ int OH_Rdb_SetDbType(OH_Rdb_ConfigV2 *config, int dbType); * {@link RDB_OK} - success. * {@link RDB_E_INVALID_ARGS} - The error code for common invalid args. * {@link RDB_E_NOT_SUPPORTED} - The error code for not support tokenizer. - * @since 18 + * @since 17 */ int OH_Rdb_SetTokenizer(OH_Rdb_ConfigV2 *config, Rdb_Tokenizer tokenizer); -- Gitee From f37306e6a09ecefe61dd748e2b7ea0fdb04cdcca Mon Sep 17 00:00:00 2001 From: bjd Date: Wed, 9 Apr 2025 10:16:27 +0800 Subject: [PATCH 53/94] =?UTF-8?q?icu=E7=89=B9=E6=80=A7=E5=9B=9E=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- distributeddatamgr/relational_store/include/relational_store.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distributeddatamgr/relational_store/include/relational_store.h b/distributeddatamgr/relational_store/include/relational_store.h index 9ccf570f2..dc0cdee93 100644 --- a/distributeddatamgr/relational_store/include/relational_store.h +++ b/distributeddatamgr/relational_store/include/relational_store.h @@ -195,14 +195,17 @@ typedef enum Rdb_DBType { typedef enum Rdb_Tokenizer { /** * @brief Means not using tokenizer. + * @since 17 */ RDB_NONE_TOKENIZER = 1, /** * @brief Means using native icu tokenizer. + * @since 17 */ RDB_ICU_TOKENIZER = 2, /** * @brief Means using self-developed enhance tokenizer. + * @since 18 */ RDB_CUSTOM_TOKENIZER = 3, } Rdb_Tokenizer; -- Gitee From 59f770c78f406203776a591035fec914c90c78e7 Mon Sep 17 00:00:00 2001 From: wangbowen36 Date: Wed, 9 Apr 2025 09:13:25 +0000 Subject: [PATCH 54/94] Remove napi_onLoad from libnapi.ndk.json Issue: https://gitee.com/openharmony/interface_sdk_c/issues/IBZSI7 Signed-off-by: wangbowen36 --- arkui/napi/libnapi.ndk.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arkui/napi/libnapi.ndk.json b/arkui/napi/libnapi.ndk.json index e9bb3b056..04e3cc6d4 100644 --- a/arkui/napi/libnapi.ndk.json +++ b/arkui/napi/libnapi.ndk.json @@ -242,9 +242,5 @@ { "first_introduced": "18", "name": "napi_wrap_enhance" - }, - { - "first_introduced": "17", - "name": "napi_onLoad" } ] -- Gitee From 41e646f490d830141c5b6034f391e84452d8d223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B0=B8=E5=87=AF?= Date: Tue, 8 Apr 2025 20:16:10 +0800 Subject: [PATCH 55/94] sdk test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘永凯 --- arkui/ace_engine/native/native_node.h | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 7118d38f3..ac6494b9b 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -1929,6 +1929,40 @@ typedef enum { */ NODE_VISIBLE_AREA_APPROXIMATE_CHANGE_RATIO = 102, + /** + * @brief Defines the translate attribute, which supports for percentile translation input, and can be set, reset, + * and obtained as required through APIs.\n + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].f32: distance to translate along the x-axis. The default unit is percentage. + * The unit is vp only if value[3] exists and value[3] is 0. The default value of value[0] is 0.\n + * .value[1].f32: distance to translate along the y-axis. The default unit is percentage. + * The unit is vp only if value[4] exists and value[4] is 0. The default value of value[1] is 0.\n + * .value[2].f32: distance to translate along the z-axis, in vp. The default value is 0.\n + * .value[3]?.i32: Whether the translation distance along the x-axis is specified as a percentage. + * The value can be 0 or 1. When the value is 1, it is specified as a percentage. + * For example, value[0].f32=0.1 and value[3].i32=1 indicates a 10% shift in the x direction. + * The default value is 1.\n + * .value[4]?.i32: Whether the translation distance along the y-axis is specified as a percentage. + * The value can be 0 or 1. When the value is 1, it is specified as a percentage. + * For example, value[1].f32=0.1 and value[4].i32=1 indicates a 10% shift in the y direction. + * The default value is 1.\n + * \n + * Format of the return value {@link ArkUI_AttributeItem}:\n + * .value[0].f32: distance to translate along the x-axis. The unit depends on value[3].\n + * .value[1].f32: distance to translate along the y-axis. The unit depends on value[4].\n + * .value[2].f32: distance to translate along the z-axis. The unit is vp.\n + * .value[3].i32: Whether the unit of the X-axis translation distance is in percentage. When value[3].i32 is 0, + * the unit of the X-axis translation distance is vp; when value[3].i32 is 1, the unit of the X-axis translation + * distance is percentage;\n + * .value[4].i32: Whether the unit of the Y-axis translation distance is in percentage. When value[4].i32 is 0, + * the unit of the Y-axis translation distance is vp; when value[4].i32 is 1, the unit of the Y-axis translation + * distance is percentage;\n + * + * @since 20 + */ + NODE_TRANSLATE_WITH_PERCENT = 103, + /** * @brief Defines the text content attribute, which can be set, reset, and obtained as required through APIs. * -- Gitee From ac6687e9a31d27ac6577d40c4ee2a6f9404b4723 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 10 Apr 2025 02:16:40 +0000 Subject: [PATCH 56/94] update multimedia/player_framework/avrecorder.h. Signed-off-by: Steven --- multimedia/player_framework/avrecorder.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/multimedia/player_framework/avrecorder.h b/multimedia/player_framework/avrecorder.h index b94e92b97..b5fc9847d 100644 --- a/multimedia/player_framework/avrecorder.h +++ b/multimedia/player_framework/avrecorder.h @@ -78,6 +78,7 @@ OH_AVErrCode OH_AVRecorder_Prepare(OH_AVRecorder *recorder, OH_AVRecorder_Config * @return Function result code. * {@link AV_ERR_OK} if the execution is successful. * {@link AV_ERR_INVALID_VAL} if input recorder is nullptr or config is null. + * {@link AV_ERR_NO_MEMORY} failed to malloc memory. * @since 18 */ OH_AVErrCode OH_AVRecorder_GetAVRecorderConfig(OH_AVRecorder *recorder, OH_AVRecorder_Config **config); @@ -181,6 +182,7 @@ OH_AVErrCode OH_AVRecorder_Release(OH_AVRecorder *recorder); * @return Function result code. * {@link AV_ERR_OK} if the execution is successful. * {@link AV_ERR_INVALID_VAL} if input recorder is nullptr. + * {@link AV_ERR_NO_MEMORY} failed to malloc memory. * @since 18 */ OH_AVErrCode OH_AVRecorder_GetAvailableEncoder(OH_AVRecorder *recorder, OH_AVRecorder_EncoderInfo **info, -- Gitee From 36a7b2e2e9a3fa07e0319dde0a46055e9f0e3eb6 Mon Sep 17 00:00:00 2001 From: yang-junfeng0621 Date: Thu, 10 Apr 2025 14:51:35 +0800 Subject: [PATCH 57/94] =?UTF-8?q?OH=5FHuks=5FListAliases=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang-junfeng0621 --- security/huks/include/native_huks_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/huks/include/native_huks_api.h b/security/huks/include/native_huks_api.h index 9c9043cdf..c8182d283 100644 --- a/security/huks/include/native_huks_api.h +++ b/security/huks/include/native_huks_api.h @@ -448,7 +448,7 @@ struct OH_Huks_Result OH_Huks_AbortSession(const struct OH_Huks_Blob *handle, * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_INTERNAL_ERROR} 12000012 - If system error ocurred. * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_COMMUNICATION_FAIL} 12000005 - If Ipc commuication failed. * {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_INSUFFICIENT_MEMORY} 12000014 - If the memory is insufficient. - * @since 18 + * @since 20 */ struct OH_Huks_Result OH_Huks_ListAliases(const struct OH_Huks_ParamSet *paramSet, struct OH_Huks_KeyAliasSet **outData); -- Gitee From d434eb74e41b26d89329801c9f194be71f0ec0b7 Mon Sep 17 00:00:00 2001 From: luqing Date: Thu, 10 Apr 2025 15:00:08 +0800 Subject: [PATCH 58/94] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8E=A5=E5=8F=A3=20Si?= =?UTF-8?q?gned-off-by:=20luqing=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- distributeddatamgr/preferences/libpreferences.ndk.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/distributeddatamgr/preferences/libpreferences.ndk.json b/distributeddatamgr/preferences/libpreferences.ndk.json index 9c41566f5..2869d8651 100644 --- a/distributeddatamgr/preferences/libpreferences.ndk.json +++ b/distributeddatamgr/preferences/libpreferences.ndk.json @@ -47,6 +47,10 @@ "first_introduced": "13", "name": "OH_Preferences_UnregisterDataObserver" }, + { + "first_introduced": "18", + "name": "OH_Preferences_IsStorageTypeSupported" + }, { "first_introduced": "13", "name": "OH_PreferencesOption_Create" @@ -63,6 +67,10 @@ "first_introduced": "13", "name": "OH_PreferencesOption_SetDataGroupId" }, + { + "first_introduced": "18", + "name": "OH_PreferencesOption_SetStorageType" + }, { "first_introduced": "13", "name": "OH_PreferencesOption_Destroy" -- Gitee From 464e96805209aae053f29d81163fcd715ac4fa92 Mon Sep 17 00:00:00 2001 From: liufei Date: Sat, 16 Nov 2024 15:58:43 +0800 Subject: [PATCH 59/94] fix compile error Signed-off-by: liufei --- .../native_drawing/drawing_text_typography.h | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/graphic/graphic_2d/native_drawing/drawing_text_typography.h b/graphic/graphic_2d/native_drawing/drawing_text_typography.h index 234ceb4c9..14beb2fd6 100644 --- a/graphic/graphic_2d/native_drawing/drawing_text_typography.h +++ b/graphic/graphic_2d/native_drawing/drawing_text_typography.h @@ -64,12 +64,12 @@ extern "C" { * @since 8 * @version 1.0 */ -enum OH_Drawing_TextDirection { +typedef enum { /** Right to left (RTL) */ TEXT_DIRECTION_RTL, /** Left to right (LTR) */ TEXT_DIRECTION_LTR, -}; +} OH_Drawing_TextDirection; /** * @brief Enumerates text alignment modes. @@ -77,7 +77,7 @@ enum OH_Drawing_TextDirection { * @since 8 * @version 1.0 */ -enum OH_Drawing_TextAlign { +typedef enum { /** Left-aligned */ TEXT_ALIGN_LEFT, /** Right-aligned */ @@ -103,7 +103,7 @@ enum OH_Drawing_TextAlign { * when OH_Drawing_TextDirection is TEXT_DIRECTION_RTL. */ TEXT_ALIGN_END, -}; +} OH_Drawing_TextAlign; /** * @brief Enumerates font weights. @@ -111,7 +111,7 @@ enum OH_Drawing_TextAlign { * @since 8 * @version 1.0 */ -enum OH_Drawing_FontWeight { +typedef enum { /** Thin */ FONT_WEIGHT_100, /** Extra-light */ @@ -130,7 +130,7 @@ enum OH_Drawing_FontWeight { FONT_WEIGHT_800, /** Black */ FONT_WEIGHT_900, -}; +} OH_Drawing_FontWeight; /** * @brief Enumerates text baselines. @@ -138,12 +138,12 @@ enum OH_Drawing_FontWeight { * @since 8 * @version 1.0 */ -enum OH_Drawing_TextBaseline { +typedef enum { /** Alphabetic, where the letters in alphabets like English sit on. */ TEXT_BASELINE_ALPHABETIC, /** Ideographic. The baseline is at the bottom of the text area. */ TEXT_BASELINE_IDEOGRAPHIC, -}; +} OH_Drawing_TextBaseline; /** * @brief Enumerates text decorations. @@ -151,7 +151,7 @@ enum OH_Drawing_TextBaseline { * @since 8 * @version 1.0 */ -enum OH_Drawing_TextDecoration { +typedef enum { /** No decoration. */ TEXT_DECORATION_NONE = 0x0, /** A underline is used for decoration. */ @@ -160,7 +160,7 @@ enum OH_Drawing_TextDecoration { TEXT_DECORATION_OVERLINE = 0x2, /** A strikethrough is used for decoration. */ TEXT_DECORATION_LINE_THROUGH = 0x4, -}; +} OH_Drawing_TextDecoration; /** * @brief Enumerates font styles. @@ -168,14 +168,14 @@ enum OH_Drawing_TextDecoration { * @since 8 * @version 1.0 */ -enum OH_Drawing_FontStyle { +typedef enum { /** Normal style */ FONT_STYLE_NORMAL, /** Italic style */ FONT_STYLE_ITALIC, /** Oblique style */ FONT_STYLE_OBLIQUE, -}; +} OH_Drawing_FontStyle; /** * @brief Enumerates placeholder vertical alignment. @@ -326,7 +326,7 @@ typedef enum { * @since 12 * @version 1.0 */ -enum OH_Drawing_FontConfigInfoErrorCode { +typedef enum { /** The list of system font configuration information was successfully obtained */ SUCCESS_FONT_CONFIG_INFO = 0, /** Unknown error */ @@ -337,7 +337,7 @@ enum OH_Drawing_FontConfigInfoErrorCode { ERROR_FONT_CONFIG_INFO_ALLOC_MEMORY = 3, /** Copy string data error */ ERROR_FONT_CONFIG_INFO_COPY_STRING_DATA = 4, -}; +} OH_Drawing_FontConfigInfoErrorCode; /** * @brief Fallback font information. @@ -512,7 +512,7 @@ typedef struct OH_Drawing_LineMetrics { * @since 12 * @version 1.0 */ -enum OH_Drawing_TextHeightBehavior { +typedef enum { /** both ascend of first row and last row style */ TEXT_HEIGHT_ALL = 0x0, /** forbidding ascend of first row style*/ @@ -521,7 +521,7 @@ enum OH_Drawing_TextHeightBehavior { TEXT_HEIGHT_DISABLE_LAST_ASCENT = 0x2, /** neither ascend of first row nor last row style */ TEXT_HEIGHT_DISABLE_ALL = 0x1 | 0x2, -}; +} OH_Drawing_TextHeightBehavior; /** * @brief Enumerates text style type. @@ -529,7 +529,7 @@ enum OH_Drawing_TextHeightBehavior { * @since 12 * @version 1.0 */ -enum OH_Drawing_TextStyleType { +typedef enum { /** None style */ TEXT_STYLE_NONE, /** All attributes style */ @@ -548,7 +548,7 @@ enum OH_Drawing_TextStyleType { TEXT_STYLE_LETTER_SPACING, /** Word spacing style */ TEXT_STYLE_WORD_SPACING -}; +} OH_Drawing_TextStyleType; /** * @brief Enumerates font width. @@ -556,7 +556,7 @@ enum OH_Drawing_TextStyleType { * @since 12 * @version 1.0 */ -enum OH_Drawing_FontWidth { +typedef enum { /* Ultra condensed font width */ FONT_WIDTH_ULTRA_CONDENSED = 1, /* Extra condensed font width */ @@ -575,7 +575,7 @@ enum OH_Drawing_FontWidth { FONT_WIDTH_EXTRA_EXPANDED = 8, /* Ultra expanded font width */ FONT_WIDTH_ULTRA_EXPANDED = 9, -}; +} OH_Drawing_FontWidth; /** * @brief Defines the font style struct. -- Gitee From 08ba9bb2f11e99c90f538c432506d2607f0ca0a2 Mon Sep 17 00:00:00 2001 From: liufei Date: Thu, 10 Apr 2025 20:25:27 +0800 Subject: [PATCH 60/94] compatibility Signed-off-by: liufei --- .../native_drawing/drawing_text_typography.h | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/graphic/graphic_2d/native_drawing/drawing_text_typography.h b/graphic/graphic_2d/native_drawing/drawing_text_typography.h index 14beb2fd6..3d49d1934 100644 --- a/graphic/graphic_2d/native_drawing/drawing_text_typography.h +++ b/graphic/graphic_2d/native_drawing/drawing_text_typography.h @@ -64,7 +64,7 @@ extern "C" { * @since 8 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_TextDirection { /** Right to left (RTL) */ TEXT_DIRECTION_RTL, /** Left to right (LTR) */ @@ -77,7 +77,7 @@ typedef enum { * @since 8 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_TextAlign { /** Left-aligned */ TEXT_ALIGN_LEFT, /** Right-aligned */ @@ -111,7 +111,7 @@ typedef enum { * @since 8 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_FontWeight { /** Thin */ FONT_WEIGHT_100, /** Extra-light */ @@ -138,7 +138,7 @@ typedef enum { * @since 8 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_TextBaseline { /** Alphabetic, where the letters in alphabets like English sit on. */ TEXT_BASELINE_ALPHABETIC, /** Ideographic. The baseline is at the bottom of the text area. */ @@ -151,7 +151,7 @@ typedef enum { * @since 8 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_TextDecoration { /** No decoration. */ TEXT_DECORATION_NONE = 0x0, /** A underline is used for decoration. */ @@ -168,7 +168,7 @@ typedef enum { * @since 8 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_FontStyle { /** Normal style */ FONT_STYLE_NORMAL, /** Italic style */ @@ -326,7 +326,7 @@ typedef enum { * @since 12 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_FontConfigInfoErrorCode { /** The list of system font configuration information was successfully obtained */ SUCCESS_FONT_CONFIG_INFO = 0, /** Unknown error */ @@ -512,7 +512,7 @@ typedef struct OH_Drawing_LineMetrics { * @since 12 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_TextHeightBehavior { /** both ascend of first row and last row style */ TEXT_HEIGHT_ALL = 0x0, /** forbidding ascend of first row style*/ @@ -529,7 +529,7 @@ typedef enum { * @since 12 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_TextStyleType { /** None style */ TEXT_STYLE_NONE, /** All attributes style */ @@ -556,7 +556,7 @@ typedef enum { * @since 12 * @version 1.0 */ -typedef enum { +typedef enum OH_Drawing_FontWidth { /* Ultra condensed font width */ FONT_WIDTH_ULTRA_CONDENSED = 1, /* Extra condensed font width */ -- Gitee From a05306155c230831e0a183dae8d9555aae30dbe1 Mon Sep 17 00:00:00 2001 From: chenjiafeng10 Date: Thu, 10 Apr 2025 21:36:44 +0800 Subject: [PATCH 61/94] =?UTF-8?q?Description:=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=5F0410=20IssueNo:=20https://gitee.com/openha?= =?UTF-8?q?rmony/interface=5Fsdk=5Fc/issues/IC06PX=20Feature=20or=20Bugfix?= =?UTF-8?q?:=20Bugfix=20Binary=20Source:No=20Signed-off-by:=20chenjiafeng?= =?UTF-8?q?=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arkui/ace_engine/native/libace.ndk.json | 48 ++++++++++++------------- arkui/ace_engine/native/native_type.h | 6 ++-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index bf6943a40..7551fc002 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -2359,6 +2359,30 @@ "first_introduced": "12", "name": "OH_ArkUI_StartDrag" }, + { + "first_introduced": "12", + "name": "OH_ArkUI_RegisterSystemColorModeChangeEvent" + }, + { + "first_introduced": "12", + "name": "OH_ArkUI_UnregisterSystemColorModeChangeEvent" + }, + { + "first_introduced": "12", + "name": "OH_ArkUI_RegisterSystemFontStyleChangeEvent" + }, + { + "first_introduced": "12", + "name": "OH_ArkUI_UnregisterSystemFontStyleChangeEvent" + }, + { + "first_introduced": "12", + "name": "OH_ArkUI_SystemFontStyleEvent_GetFontSizeScale" + }, + { + "first_introduced": "12", + "name": "OH_ArkUI_SystemFontStyleEvent_GetFontWeightScale" + }, { "first_introduced": "12", "name": "OH_ArkUI_DialogDismissEvent_SetShouldBlockDismiss" @@ -2435,30 +2459,6 @@ "first_introduced": "12", "name": "OH_ArkUI_CustomSpanDrawInfo_GetBaseline" }, - { - "first_introduced": "12", - "name": "OH_ArkUI_RegisterSystemColorModeChangeEvent" - }, - { - "first_introduced": "12", - "name": "OH_ArkUI_UnregisterSystemColorModeChangeEvent" - }, - { - "first_introduced": "12", - "name": "OH_ArkUI_RegisterSystemFontStyleChangeEvent" - }, - { - "first_introduced": "12", - "name": "OH_ArkUI_UnregisterSystemFontStyleChangeEvent" - }, - { - "first_introduced": "12", - "name": "OH_ArkUI_SystemFontStyleEvent_GetFontSizeScale" - }, - { - "first_introduced": "12", - "name": "OH_ArkUI_SystemFontStyleEvent_GetFontWeightScale" - }, { "first_introduced": "13", "name": "OH_ArkUI_AccessibilityProviderRegisterCallback" diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index e05d40ec2..5d4d17691 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -4280,7 +4280,7 @@ float OH_ArkUI_ListChildrenMainSizeOption_GetMainSize(ArkUI_ListChildrenMainSize *
If the result returns nullptr, there may be out of memory. * @since 12 */ -ArkUI_CustomSpanMeasureInfo* OH_ArkUI_CustomSpanMeasureInfo_Create(); +ArkUI_CustomSpanMeasureInfo* OH_ArkUI_CustomSpanMeasureInfo_Create(void); /** * @brief Disposes of measurement information of this custom span. @@ -4307,7 +4307,7 @@ float OH_ArkUI_CustomSpanMeasureInfo_GetFontSize(ArkUI_CustomSpanMeasureInfo* in *
If the result returns nullptr, there may be out of memory. * @since 12 */ -ArkUI_CustomSpanMetrics* OH_ArkUI_CustomSpanMetrics_Create(); +ArkUI_CustomSpanMetrics* OH_ArkUI_CustomSpanMetrics_Create(void); /** * @brief Disposes of measurement metrics of this custom span. @@ -4350,7 +4350,7 @@ int32_t OH_ArkUI_CustomSpanMetrics_SetHeight(ArkUI_CustomSpanMetrics* metrics, f *
If the result returns nullptr, there may be out of memory. * @since 12 */ -ArkUI_CustomSpanDrawInfo* OH_ArkUI_CustomSpanDrawInfo_Create(); +ArkUI_CustomSpanDrawInfo* OH_ArkUI_CustomSpanDrawInfo_Create(void); /** * @brief Disposes of drawing information for this custom span. -- Gitee From ced2937f499ae4d4090c5f83e20c9d7a4b4fa28c Mon Sep 17 00:00:00 2001 From: bjd Date: Fri, 11 Apr 2025 10:50:02 +0800 Subject: [PATCH 62/94] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- .../relational_store/libnative_rdb.ndk.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/distributeddatamgr/relational_store/libnative_rdb.ndk.json b/distributeddatamgr/relational_store/libnative_rdb.ndk.json index 5d4110e08..944ef63e3 100644 --- a/distributeddatamgr/relational_store/libnative_rdb.ndk.json +++ b/distributeddatamgr/relational_store/libnative_rdb.ndk.json @@ -44,6 +44,14 @@ "first_introduced": "14", "name":"OH_Rdb_SetDbType" }, + { + "first_introduced": "16", + "name":"OH_Rdb_IsTokenizerSupported" + }, + { + "first_introduced": "16", + "name":"OH_Rdb_SetTokenizer" + }, { "first_introduced": "18", "name":"OH_Rdb_SetPersistent" -- Gitee From 7cfd4fbf841643bc9b2f14179e618ef685ec6cbd Mon Sep 17 00:00:00 2001 From: bjd Date: Fri, 11 Apr 2025 11:11:53 +0800 Subject: [PATCH 63/94] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- distributeddatamgr/relational_store/libnative_rdb.ndk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributeddatamgr/relational_store/libnative_rdb.ndk.json b/distributeddatamgr/relational_store/libnative_rdb.ndk.json index 944ef63e3..41a063d54 100644 --- a/distributeddatamgr/relational_store/libnative_rdb.ndk.json +++ b/distributeddatamgr/relational_store/libnative_rdb.ndk.json @@ -49,7 +49,7 @@ "name":"OH_Rdb_IsTokenizerSupported" }, { - "first_introduced": "16", + "first_introduced": "17", "name":"OH_Rdb_SetTokenizer" }, { -- Gitee From 8b2968e96018c997335689d9f5207d78099c7596 Mon Sep 17 00:00:00 2001 From: bjd Date: Fri, 11 Apr 2025 11:21:41 +0800 Subject: [PATCH 64/94] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- .../relational_store/libnative_rdb.ndk.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/distributeddatamgr/relational_store/libnative_rdb.ndk.json b/distributeddatamgr/relational_store/libnative_rdb.ndk.json index 41a063d54..bd9e55864 100644 --- a/distributeddatamgr/relational_store/libnative_rdb.ndk.json +++ b/distributeddatamgr/relational_store/libnative_rdb.ndk.json @@ -44,10 +44,6 @@ "first_introduced": "14", "name":"OH_Rdb_SetDbType" }, - { - "first_introduced": "16", - "name":"OH_Rdb_IsTokenizerSupported" - }, { "first_introduced": "17", "name":"OH_Rdb_SetTokenizer" @@ -56,6 +52,10 @@ "first_introduced": "18", "name":"OH_Rdb_SetPersistent" }, + { + "first_introduced": "18", + "name":"OH_Rdb_IsTokenizerSupported" + }, { "first_introduced": "14", "name":"OH_Rdb_GetSupportedDbType" -- Gitee From ac7f4f3baf6c23c19b334449d7f26c19e32c5544 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Fri, 11 Apr 2025 14:26:12 +0800 Subject: [PATCH 65/94] =?UTF-8?q?slider=E8=A7=A6=E6=8E=A7=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E8=A1=A5=E5=85=85=E6=8C=AF=E5=8A=A8=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghang --- arkui/ace_engine/native/native_node.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index ac6494b9b..c1458a02f 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -4580,6 +4580,8 @@ typedef enum { * \n * Format of the return value {@link ArkUI_AttributeItem}:\n * value[0].i32: whether to feedback.\n + * When enabling haptic feedback, you need to add "ohos.permission.VIBRATE" in the + * requestPermissions field of the module.json5 file to enable vibration permission.\n * * @since 18 */ -- Gitee From 9e0957698875b5c5c79ec459ebab1830f834c239 Mon Sep 17 00:00:00 2001 From: shenkang Date: Thu, 10 Apr 2025 15:36:20 +0800 Subject: [PATCH 66/94] =?UTF-8?q?fix:capi=E6=8E=A5=E5=8F=A3=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=A0=81=E6=B3=A8=E9=87=8A=E5=85=BC=E5=AE=B9=E6=80=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shenkang --- .../external_device_manager/hid/hid_ddk_api.h | 1 + .../scsi_peripheral/scsi_peripheral_api.h | 1 + .../external_device_manager/usb/usb_ddk_api.h | 21 ++++++++++++++++++- .../usb_serial/usb_serial_api.h | 1 - 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/external_device_manager/hid/hid_ddk_api.h b/drivers/external_device_manager/hid/hid_ddk_api.h index 8ceafb01a..ddbf2478e 100644 --- a/drivers/external_device_manager/hid/hid_ddk_api.h +++ b/drivers/external_device_manager/hid/hid_ddk_api.h @@ -97,6 +97,7 @@ int32_t OH_Hid_EmitEvent(int32_t deviceId, const Hid_EmitItem items[], uint16_t * @return {@link HID_DDK_SUCCESS} operation successful. * {@link HID_DDK_NO_PERM} permission check failed. * {@link HID_DDK_INVALID_OPERATION} connect hid ddk service failed or the caller is not the creator of device. + * {@link HID_DDK_NULL_PTR} the device does not exist. * @since 11 * @version 1.0 */ diff --git a/drivers/external_device_manager/scsi_peripheral/scsi_peripheral_api.h b/drivers/external_device_manager/scsi_peripheral/scsi_peripheral_api.h index f262f21df..ccfc694b4 100644 --- a/drivers/external_device_manager/scsi_peripheral/scsi_peripheral_api.h +++ b/drivers/external_device_manager/scsi_peripheral/scsi_peripheral_api.h @@ -83,6 +83,7 @@ int32_t OH_ScsiPeripheral_Release(void); * {@link SCSIPERIPHERAL_DDK_IO_ERROR} i/o operation error. * {@link SCSIPERIPHERAL_DDK_DEVICE_NOT_FOUND} device not found by deviceId. * {@link SCSIPERIPHERAL_DDK_INVALID_OPERATION} this operation is not supported. + * {@link SCSIPERIPHERAL_DDK_TIMEOUT} transmission timeout. * @since 18 */ int32_t OH_ScsiPeripheral_Open(uint64_t deviceId, uint8_t interfaceIndex, ScsiPeripheral_Device **dev); diff --git a/drivers/external_device_manager/usb/usb_ddk_api.h b/drivers/external_device_manager/usb/usb_ddk_api.h index d13ed1319..bdf2fedc7 100644 --- a/drivers/external_device_manager/usb/usb_ddk_api.h +++ b/drivers/external_device_manager/usb/usb_ddk_api.h @@ -55,7 +55,9 @@ extern "C" { * * @permission ohos.permission.ACCESS_DDK_USB * @return {@link USB_DDK_SUCCESS} the operation is successful. - * {@link USB_DDK_FAILED} permission check failed or connect usb ddk service failed or internal error failed. + * {@link USB_DDK_INVALID_OPERATION} connect usb ddk service failed or internal error. + * {@link USB_DDK_NO_PERM} permission check failed. + * {@link USB_DDK_MEMORY_ERROR} memory allocation failed. * @since 10 * @version 1.0 */ @@ -76,6 +78,7 @@ void OH_Usb_Release(void); * @permission ohos.permission.ACCESS_DDK_USB * @return {@link USB_DDK_SUCCESS} the operation is successful. * {@link USB_DDK_NO_PERM} permission check failed. + * {@link USB_DDK_INVALID_OPERATION} connect usb ddk service failed. * @since 18 * @version 1.0 */ @@ -109,6 +112,8 @@ int32_t OH_Usb_GetDeviceDescriptor(uint64_t deviceId, struct UsbDeviceDescriptor * {@link USB_DDK_NO_PERM} permission check failed. * {@link USB_DDK_INVALID_OPERATION} connect usb ddk service failed. * {@link USB_DDK_INVALID_PARAMETER} config is null. + * {@link USB_DDK_IO_FAILED} data IO exception. + * {@link USB_DDK_MEMORY_ERROR} memory allocation failed. * @since 10 * @version 1.0 */ @@ -138,6 +143,7 @@ void OH_Usb_FreeConfigDescriptor(struct UsbDdkConfigDescriptor * const config); * {@link USB_DDK_NO_PERM} permission check failed. * {@link USB_DDK_INVALID_OPERATION} connect usb ddk service failed. * {@link USB_DDK_INVALID_PARAMETER} interfaceHandle is null. + * {@link USB_DDK_MEMORY_ERROR} memory exceeds limit. * @since 10 * @version 1.0 */ @@ -151,6 +157,7 @@ int32_t OH_Usb_ClaimInterface(uint64_t deviceId, uint8_t interfaceIndex, uint64_ * @return {@link USB_DDK_SUCCESS} the operation is successful. * {@link USB_DDK_NO_PERM} permission check failed. * {@link USB_DDK_INVALID_OPERATION} connect usb ddk service failed. + * {@link USB_DDK_INVALID_PARAMETER} parameter error. * @since 10 * @version 1.0 */ @@ -166,6 +173,7 @@ int32_t OH_Usb_ReleaseInterface(uint64_t interfaceHandle); * @return {@link USB_DDK_SUCCESS} the operation is successful. * {@link USB_DDK_NO_PERM} permission check failed. * {@link USB_DDK_INVALID_OPERATION} connect usb ddk service failed. + * {@link USB_DDK_INVALID_PARAMETER} parameter error. * @since 10 * @version 1.0 */ @@ -202,6 +210,8 @@ int32_t OH_Usb_GetCurrentInterfaceSetting(uint64_t interfaceHandle, uint8_t *set * {@link USB_DDK_INVALID_PARAMETER} setup is null or data is null or dataLen is null or dataLen is less than\n * size of the read data. * {@link USB_DDK_MEMORY_ERROR} the memory of read data copies failed. + * {@link USB_DDK_IO_FAILED} data IO exception. + * {@link USB_DDK_TIMEOUT} interface timeout. * @since 10 * @version 1.0 */ @@ -221,6 +231,9 @@ int32_t OH_Usb_SendControlReadRequest(uint64_t interfaceHandle, const struct Usb * {@link USB_DDK_NO_PERM} permission check failed. * {@link USB_DDK_INVALID_OPERATION} connect usb ddk service failed. * {@link USB_DDK_INVALID_PARAMETER} setup is null or data is null. + * {@link USB_DDK_MEMORY_ERROR} the memory of read data copies failed. + * {@link USB_DDK_IO_FAILED} data IO exception. + * {@link USB_DDK_TIMEOUT} interface timeout. * @since 10 * @version 1.0 */ @@ -238,6 +251,9 @@ int32_t OH_Usb_SendControlWriteRequest(uint64_t interfaceHandle, const struct Us * {@link USB_DDK_NO_PERM} permission check failed. * {@link USB_DDK_INVALID_OPERATION} connect usb ddk service failed. * {@link USB_DDK_INVALID_PARAMETER} pipe is null or devMmap is null or address of devMmap is null. + * {@link USB_DDK_MEMORY_ERROR} the memory of read data copies failed. + * {@link USB_DDK_IO_FAILED} data IO exception. + * {@link USB_DDK_TIMEOUT} interface timeout. * @since 10 * @version 1.0 */ @@ -254,6 +270,9 @@ int32_t OH_Usb_SendPipeRequest(const struct UsbRequestPipe *pipe, UsbDeviceMemMa * {@link USB_DDK_NO_PERM} permission check failed. * {@link USB_DDK_INVALID_OPERATION} connect usb ddk service failed. * {@link USB_DDK_INVALID_PARAMETER} pipe is null or ashmem is null or address of ashmem is null. + * {@link USB_DDK_MEMORY_ERROR} the memory of read data copies failed. + * {@link USB_DDK_IO_FAILED} data IO exception. + * {@link USB_DDK_TIMEOUT} interface timeout. * @since 12 */ int32_t OH_Usb_SendPipeRequestWithAshmem(const struct UsbRequestPipe *pipe, DDK_Ashmem *ashmem); diff --git a/drivers/external_device_manager/usb_serial/usb_serial_api.h b/drivers/external_device_manager/usb_serial/usb_serial_api.h index 46eb55427..850595951 100644 --- a/drivers/external_device_manager/usb_serial/usb_serial_api.h +++ b/drivers/external_device_manager/usb_serial/usb_serial_api.h @@ -138,7 +138,6 @@ int32_t OH_UsbSerial_Read(UsbSerial_Device *dev, uint8_t *buff, uint32_t bufferS * 2.buff is null; 3.bufferSize is zero; 4. bytesWritten is null. * {@link USB_SERIAL_DDK_INIT_ERROR} the ddk not init. * {@link USB_SERIAL_DDK_SERVICE_ERROR} communication with the ddk service failed. - * {@link USB_SERIAL_DDK_MEMORY_ERROR} the buff is outside accessible address space error. * {@link USB_SERIAL_DDK_IO_ERROR} the ddk I/O error. * {@link USB_SERIAL_DDK_INVALID_OPERATION} invalid operation. * @since 18 -- Gitee From be0d79d7ceb06ffcf8f062c38cbf0d139016a47b Mon Sep 17 00:00:00 2001 From: zhuhan Date: Tue, 15 Apr 2025 17:17:12 +0800 Subject: [PATCH 67/94] 17 Signed-off-by: zhuhan Change-Id: I2532242a5f24e59f75bade117b46fb8bfb5989cf --- .../ability_base/libability_base_want.json | 16 ++++++++-------- AbilityKit/ability_base/want.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/AbilityKit/ability_base/libability_base_want.json b/AbilityKit/ability_base/libability_base_want.json index 03133ce91..96066b3d4 100644 --- a/AbilityKit/ability_base/libability_base_want.json +++ b/AbilityKit/ability_base/libability_base_want.json @@ -32,35 +32,35 @@ "name": "OH_AbilityBase_GetWantFd" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AbilityBase_SetWantUri" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AbilityBase_GetWantUri" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AbilityBase_SetWantInt32Param" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AbilityBase_GetWantInt32Param" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AbilityBase_SetWantBoolParam" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AbilityBase_GetWantBoolParam" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AbilityBase_SetWantDoubleParam" }, { - "first_introduced": "18", + "first_introduced": "17", "name": "OH_AbilityBase_GetWantDoubleParam" } ] \ No newline at end of file diff --git a/AbilityKit/ability_base/want.h b/AbilityKit/ability_base/want.h index e688836ec..093555012 100644 --- a/AbilityKit/ability_base/want.h +++ b/AbilityKit/ability_base/want.h @@ -169,7 +169,7 @@ AbilityBase_ErrorCode OH_AbilityBase_GetWantFd(AbilityBase_Want* want, const cha * @return The error code. * {@link ABILITY_BASE_ERROR_CODE_NO_ERROR} if the operation is successful. * {@link ABILITY_BASE_ERROR_CODE_PARAM_INVALID} if the input parameters are invalid. - * @since 18 + * @since 17 */ AbilityBase_ErrorCode OH_AbilityBase_SetWantUri(AbilityBase_Want* want, const char* uri); @@ -182,7 +182,7 @@ AbilityBase_ErrorCode OH_AbilityBase_SetWantUri(AbilityBase_Want* want, const ch * @return The error code. * {@link ABILITY_BASE_ERROR_CODE_NO_ERROR} if the operation is successful. * {@link ABILITY_BASE_ERROR_CODE_PARAM_INVALID} if the input parameters are invalid. - * @since 18 + * @since 17 */ AbilityBase_ErrorCode OH_AbilityBase_GetWantUri(AbilityBase_Want* want, char* uri, size_t uriSize); @@ -195,7 +195,7 @@ AbilityBase_ErrorCode OH_AbilityBase_GetWantUri(AbilityBase_Want* want, char* ur * @return The error code. * {@link ABILITY_BASE_ERROR_CODE_NO_ERROR} if the operation is successful. * {@link ABILITY_BASE_ERROR_CODE_PARAM_INVALID} if the input parameters are invalid. - * @since 18 + * @since 17 */ AbilityBase_ErrorCode OH_AbilityBase_SetWantInt32Param(AbilityBase_Want* want, const char* key, int32_t value); @@ -208,7 +208,7 @@ AbilityBase_ErrorCode OH_AbilityBase_SetWantInt32Param(AbilityBase_Want* want, c * @return The error code. * {@link ABILITY_BASE_ERROR_CODE_NO_ERROR} if the operation is successful. * {@link ABILITY_BASE_ERROR_CODE_PARAM_INVALID} if the input parameters are invalid. - * @since 18 + * @since 17 */ AbilityBase_ErrorCode OH_AbilityBase_GetWantInt32Param(AbilityBase_Want* want, const char* key, int32_t* value); @@ -221,7 +221,7 @@ AbilityBase_ErrorCode OH_AbilityBase_GetWantInt32Param(AbilityBase_Want* want, c * @return The error code. * {@link ABILITY_BASE_ERROR_CODE_NO_ERROR} if the operation is successful. * {@link ABILITY_BASE_ERROR_CODE_PARAM_INVALID} if the input parameters are invalid. - * @since 18 + * @since 17 */ AbilityBase_ErrorCode OH_AbilityBase_SetWantBoolParam(AbilityBase_Want* want, const char* key, bool value); @@ -234,7 +234,7 @@ AbilityBase_ErrorCode OH_AbilityBase_SetWantBoolParam(AbilityBase_Want* want, co * @return The error code. * {@link ABILITY_BASE_ERROR_CODE_NO_ERROR} if the operation is successful. * {@link ABILITY_BASE_ERROR_CODE_PARAM_INVALID} if the input parameters are invalid. - * @since 18 + * @since 17 */ AbilityBase_ErrorCode OH_AbilityBase_GetWantBoolParam(AbilityBase_Want* want, const char* key, bool* value); @@ -247,7 +247,7 @@ AbilityBase_ErrorCode OH_AbilityBase_GetWantBoolParam(AbilityBase_Want* want, co * @return The error code. * {@link ABILITY_BASE_ERROR_CODE_NO_ERROR} if the operation is successful. * {@link ABILITY_BASE_ERROR_CODE_PARAM_INVALID} if the input parameters are invalid. - * @since 18 + * @since 17 */ AbilityBase_ErrorCode OH_AbilityBase_SetWantDoubleParam(AbilityBase_Want* want, const char* key, double value); @@ -260,7 +260,7 @@ AbilityBase_ErrorCode OH_AbilityBase_SetWantDoubleParam(AbilityBase_Want* want, * @return The error code. * {@link ABILITY_BASE_ERROR_CODE_NO_ERROR} if the operation is successful. * {@link ABILITY_BASE_ERROR_CODE_PARAM_INVALID} if the input parameters are invalid. - * @since 18 + * @since 17 */ AbilityBase_ErrorCode OH_AbilityBase_GetWantDoubleParam(AbilityBase_Want* want, const char* key, double* value); -- Gitee From 0608c4ee9767ec22d5a4ab6122d923d36b834fe0 Mon Sep 17 00:00:00 2001 From: lihui Date: Tue, 15 Apr 2025 21:25:18 +0800 Subject: [PATCH 68/94] add active hdbc guide Signed-off-by: lihui --- graphic/graphic_2d/native_window/external_window.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h index 41b01ce8d..edc68d7f7 100644 --- a/graphic/graphic_2d/native_window/external_window.h +++ b/graphic/graphic_2d/native_window/external_window.h @@ -544,6 +544,17 @@ int32_t OH_NativeWindow_NativeWindowAbortBuffer(OHNativeWindow *window, OHNative * @brief Sets or obtains the attributes of a native window, including the width, height, and content format.\n * This interface is a non-thread-safe type interface.\n * + *

API Note + * + * Performance Note + *

By default, the window buffer in the current operating system is accessed via the CPU. If an application + * does not need to access the window buffer data using the CPU, it can proactively disable CPU access to + * enhance energy efficiency and reduce power consumption. + *

+ *

For details about how to optimize power consumption for data read/write operations in data buffers, + * see [How do I proactively disable CPU access to window buffers to reduce power consumption?]{@link https://developer.huawei.com/consumer/en/doc/harmonyos-faqs/faqs-arkgraphics-2d-14}.

+ *

+ * * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow * @param window Indicates the pointer to a OHNativeWindow instance. * @param code Indicates the operation code, pointer to NativeWindowOperation. -- Gitee From 0822c062467d4f4b34e4ae5487f11efa12fb78d7 Mon Sep 17 00:00:00 2001 From: ustc-tianyu Date: Wed, 16 Apr 2025 15:46:43 +0800 Subject: [PATCH 69/94] codecheck Signed-off-by: ustc-tianyu --- graphic/graphic_2d/native_drawing/drawing_error_code.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphic/graphic_2d/native_drawing/drawing_error_code.h b/graphic/graphic_2d/native_drawing/drawing_error_code.h index 5bdc19682..0c6e6e0c8 100644 --- a/graphic/graphic_2d/native_drawing/drawing_error_code.h +++ b/graphic/graphic_2d/native_drawing/drawing_error_code.h @@ -89,7 +89,7 @@ OH_Drawing_ErrorCode OH_Drawing_ErrorCodeGet(); * @since 18 * @version 1.0 */ -void OH_Drawing_ErrorCodeReset(); +void OH_Drawing_ErrorCodeReset(void); #ifdef __cplusplus } #endif -- Gitee From 006e117db17cafee22d9a14ec7bb0d3ae285aa21 Mon Sep 17 00:00:00 2001 From: niyisheng Date: Thu, 17 Apr 2025 11:19:38 +0800 Subject: [PATCH 70/94] =?UTF-8?q?=E6=95=B4=E6=94=B9ets=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: niyisheng --- DataProtectionKit/dlp_permission_api.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DataProtectionKit/dlp_permission_api.h b/DataProtectionKit/dlp_permission_api.h index 7033efee1..584d663c7 100644 --- a/DataProtectionKit/dlp_permission_api.h +++ b/DataProtectionKit/dlp_permission_api.h @@ -145,7 +145,7 @@ DLP_ErrCode OH_DLP_IsInSandbox(bool *isInSandbox); * call this API, which is available only for non-DLP sandbox applications. * {@link DLP_ErrCode#ERR_OH_SYSTEM_SERVICE_EXCEPTION} 19100011 - If the system ability * works abnormally. - * {@link DLP_ErrCode#ERR_OH_APPLICATION_NOT_AUTHORIZED} 19100018 - If not authorized application. + * {@link DLP_ErrCode#ERR_OH_APPLICATION_NOT_AUTHORIZED} 19100018 - If the application is not authorized. * @since 14 */ DLP_ErrCode OH_DLP_SetSandboxAppConfig(const char *configInfo); @@ -158,7 +158,7 @@ DLP_ErrCode OH_DLP_SetSandboxAppConfig(const char *configInfo); * {@link DLP_ErrCode#ERR_OH_SYSTEM_SERVICE_EXCEPTION} 19100011 - If the system ability * works abnormally. * {@link DLP_ErrCode#ERR_OH_OUT_OF_MEMORY} 19100012 - If the memory error. - * {@link DLP_ErrCode#ERR_OH_APPLICATION_NOT_AUTHORIZED} 19100018 - If not authorized application. + * {@link DLP_ErrCode#ERR_OH_APPLICATION_NOT_AUTHORIZED} 19100018 - If the application is not authorized. * @since 14 */ DLP_ErrCode OH_DLP_GetSandboxAppConfig(char **configInfo); @@ -171,7 +171,7 @@ DLP_ErrCode OH_DLP_GetSandboxAppConfig(char **configInfo); * call this API, which is available only for non-DLP sandbox applications. * {@link DLP_ErrCode#ERR_OH_SYSTEM_SERVICE_EXCEPTION} 19100011 - If the system ability * works abnormally. - * {@link DLP_ErrCode#ERR_OH_APPLICATION_NOT_AUTHORIZED} 19100018 - If not authorized application. + * {@link DLP_ErrCode#ERR_OH_APPLICATION_NOT_AUTHORIZED} 19100018 - If the application is not authorized. * @since 14 */ DLP_ErrCode OH_DLP_CleanSandboxAppConfig(); -- Gitee From db2c01b40f973200fb06708bf6b9b0885c495603 Mon Sep 17 00:00:00 2001 From: magekkkk Date: Thu, 17 Apr 2025 06:07:05 +0000 Subject: [PATCH 71/94] add perf doc Signed-off-by: magekkkk --- .../common/native_audiostreambuilder.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/multimedia/audio_framework/common/native_audiostreambuilder.h b/multimedia/audio_framework/common/native_audiostreambuilder.h index 5fb946d81..799d066cd 100644 --- a/multimedia/audio_framework/common/native_audiostreambuilder.h +++ b/multimedia/audio_framework/common/native_audiostreambuilder.h @@ -272,6 +272,22 @@ OH_AudioStream_Result OH_AudioStreamBuilder_SetCapturerCallback(OH_AudioStreamBu /** * Create the audio renderer client. * + * The AudioRenderer instance is used to play streaming audio data. + * When using AudioRenderer apis, there are many instructions for application + * to achieve better performance and lower power consumption: + * In music or audiobook background playback situation, you can have low power + * consumption by following this best practices document [Low-Power Rules in Music Playback Scenarios]{@link + * https://developer.huawei.com/consumer/en/doc/best-practices/bpta-music-playback-scenarios}. + * And for navigation situation, you can follow [Low-Power Rules in Navigation and Positioning Scenarios]{@link + * https://developer.huawei.com/consumer/en/doc/best-practices/bpta-navigation-scenarios}. + * + * Application developer should also be careful when app goes to background, please check if your audio playback + * is still needed, see [Audio Resources]{@link + * https://developer.huawei.com/consumer/en/doc/best-practices/bpta-reasonable-audio-use}. + * And avoiding to send silence audio data continuously to waste system resources, otherwise system will take + * control measures when this behavior is detected, see [Audio Playback]{@link + * https://developer.huawei.com/consumer/en/doc/best-practices/bpta-reasonable-audio-playback-use}. + * * @since 10 * * @param builder Reference provided by OH_AudioStreamBuilder_Create() -- Gitee From b4ad5e7a498ddfd6c973998f9fd4a44ab4879b84 Mon Sep 17 00:00:00 2001 From: benb365 Date: Fri, 18 Apr 2025 10:30:42 +0800 Subject: [PATCH 72/94] Fix API version. Signed-off-by: benb365 Change-Id: I24fc9f5a248e607b199fa0d1f1db4f28fb7014c4 --- arkui/ace_engine/native/libace.ndk.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 7551fc002..3a129e851 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -252,15 +252,15 @@ "name": "OH_ArkUI_GestureInterruptInfo_GetSystemRecognizerType" }, { - "first_introduced": "18", + "first_introduced": "15", "name": "OH_ArkUI_GestureInterruptInfo_GetTouchRecognizers" }, { - "first_introduced": "18", + "first_introduced": "15", "name": "OH_ArkUI_TouchRecognizer_GetNodeHandle" }, { - "first_introduced": "18", + "first_introduced": "15", "name": "OH_ArkUI_TouchRecognizer_CancelTouch" }, { -- Gitee From b710467ef472097a8aa9e362d32c333580f6bc69 Mon Sep 17 00:00:00 2001 From: zhangwt3652 Date: Fri, 18 Apr 2025 18:01:44 +0800 Subject: [PATCH 73/94] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwt3652 --- multimedia/av_session/native_avsession.h | 1 + 1 file changed, 1 insertion(+) diff --git a/multimedia/av_session/native_avsession.h b/multimedia/av_session/native_avsession.h index 50b7e6459..b877c0c88 100644 --- a/multimedia/av_session/native_avsession.h +++ b/multimedia/av_session/native_avsession.h @@ -327,6 +327,7 @@ typedef AVSessionCallback_Result (*OH_AVSessionCallback_OnToggleFavorite)(OH_AVS * @param avsession Pointer to a viriable to receive the OH_AVSession * @return Function result code： * {@link AV_SESSION_ERR_SUCCESS} If the execution is successful. + * {@link AV_SESSION_ERR_SERVICE_EXCEPTION} If session already existed or internal server error. * {@link AV_SESSION_ERR_INVALID_PARAMETER}: * 1. The param of sessionType is invalid. * 2. The param of sessionTag is nullptr. -- Gitee From f837510e79aa54f4c2d84d99c16b0da3a2b72d65 Mon Sep 17 00:00:00 2001 From: m00472246 Date: Sat, 19 Apr 2025 14:53:22 +0800 Subject: [PATCH 74/94] =?UTF-8?q?nativeimage=E5=A2=9E=E5=8A=A0=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=80=A7=E6=B8=B2=E6=9F=93=E4=BC=98=E5=85=88=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=20Signed-off-by:=20m00472246=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: m00472246 --- .../native_image/libnative_image.ndk.json | 4 ++++ graphic/graphic_2d/native_image/native_image.h | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/graphic/graphic_2d/native_image/libnative_image.ndk.json b/graphic/graphic_2d/native_image/libnative_image.ndk.json index 1b40db3aa..3769a695f 100644 --- a/graphic/graphic_2d/native_image/libnative_image.ndk.json +++ b/graphic/graphic_2d/native_image/libnative_image.ndk.json @@ -34,5 +34,9 @@ { "first_introduced": "13", "name": "OH_ConsumerSurface_SetDefaultSize" + }, + { + "first_introduced": "17", + "name": "OH_NativeImage_SetRealTimePriorityMode" } ] \ No newline at end of file diff --git a/graphic/graphic_2d/native_image/native_image.h b/graphic/graphic_2d/native_image/native_image.h index 83d30d81f..67a4eed83 100644 --- a/graphic/graphic_2d/native_image/native_image.h +++ b/graphic/graphic_2d/native_image/native_image.h @@ -350,6 +350,23 @@ int32_t OH_ConsumerSurface_SetDefaultUsage(OH_NativeImage* image, uint64_t usage * @version 1.0 */ int32_t OH_ConsumerSurface_SetDefaultSize(OH_NativeImage* image, int32_t width, int32_t height); + +/** + * @brief Set the rendering in real-time priority mode of the OH_NativeImage.\n + * In this mode, the most recent buffer is promptly rendered for display.\n + * This mode can not simultaneously guarantee high frame rate requirements.\n + * After enabling this mode, setting the buffer queue size on the producer will not take effect.\n + * After this mode is enabled, it cannot be reverted to normal mode.\n + * This interface is a non-thread-safe type interface.\n + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeImage + * @param image Indicates the pointer to a OH_NativeImage instance. + * @return {@link NATIVE_ERROR_OK} 0 - Success. + * {@link NATIVE_ERROR_INVALID_ARGUMENTS} 40001000 - image is NULL. + * @since 17 + * @version 1.0 + */ +int32_t OH_NativeImage_SetRealTimePriorityMode(OH_NativeImage* image); #ifdef __cplusplus } #endif -- Gitee From 5c6d7491a8b31abb5b118f377326a2aec0c10537 Mon Sep 17 00:00:00 2001 From: m00472246 Date: Sat, 19 Apr 2025 15:05:38 +0800 Subject: [PATCH 75/94] =?UTF-8?q?nativeimage=E5=A2=9E=E5=8A=A0=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=80=A7=E6=B8=B2=E6=9F=93=E4=BC=98=E5=85=88=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=20Signed-off-by:=20m00472246=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: m00472246 --- graphic/graphic_2d/native_image/native_image.h | 1 + 1 file changed, 1 insertion(+) diff --git a/graphic/graphic_2d/native_image/native_image.h b/graphic/graphic_2d/native_image/native_image.h index 67a4eed83..c272afc11 100644 --- a/graphic/graphic_2d/native_image/native_image.h +++ b/graphic/graphic_2d/native_image/native_image.h @@ -357,6 +357,7 @@ int32_t OH_ConsumerSurface_SetDefaultSize(OH_NativeImage* image, int32_t width, * This mode can not simultaneously guarantee high frame rate requirements.\n * After enabling this mode, setting the buffer queue size on the producer will not take effect.\n * After this mode is enabled, it cannot be reverted to normal mode.\n + * This interface must be called before the OH_NativeImage_AcquireNativeWindow call.\n * This interface is a non-thread-safe type interface.\n * * @syscap SystemCapability.Graphic.Graphic2D.NativeImage -- Gitee From b5bd44bc6e169f0167755e6242f9fcd81b69bc10 Mon Sep 17 00:00:00 2001 From: m00472246 Date: Sat, 19 Apr 2025 19:05:22 +0800 Subject: [PATCH 76/94] =?UTF-8?q?nativeimage=E5=A2=9E=E5=8A=A0=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=80=A7=E6=B8=B2=E6=9F=93=E4=BC=98=E5=85=88=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=20Signed-off-by:=20m00472246=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: m00472246 --- graphic/graphic_2d/native_image/native_image.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphic/graphic_2d/native_image/native_image.h b/graphic/graphic_2d/native_image/native_image.h index c272afc11..744b367de 100644 --- a/graphic/graphic_2d/native_image/native_image.h +++ b/graphic/graphic_2d/native_image/native_image.h @@ -357,7 +357,7 @@ int32_t OH_ConsumerSurface_SetDefaultSize(OH_NativeImage* image, int32_t width, * This mode can not simultaneously guarantee high frame rate requirements.\n * After enabling this mode, setting the buffer queue size on the producer will not take effect.\n * After this mode is enabled, it cannot be reverted to normal mode.\n - * This interface must be called before the OH_NativeImage_AcquireNativeWindow call.\n + * This interface must be called after the OH_NativeImage_Create call immediately.\n * This interface is a non-thread-safe type interface.\n * * @syscap SystemCapability.Graphic.Graphic2D.NativeImage -- Gitee From 42b03a24a365f9ab20a572fab9a6b074611610ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BF=9E=E6=B1=A0?= Date: Mon, 21 Apr 2025 10:52:51 +0800 Subject: [PATCH 77/94] add active hdbc guide to CAPI XComponent interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈俞池 --- .../native/native_interface_xcomponent.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/arkui/ace_engine/native/native_interface_xcomponent.h b/arkui/ace_engine/native/native_interface_xcomponent.h index 851520486..ba637bd4d 100644 --- a/arkui/ace_engine/native/native_interface_xcomponent.h +++ b/arkui/ace_engine/native/native_interface_xcomponent.h @@ -326,7 +326,21 @@ typedef struct OH_NativeXComponent OH_NativeXComponent; * @version 1.0 */ typedef struct OH_NativeXComponent_Callback { - /** Called when the surface is created. */ + /** + * @brief Called when the surface is created. + * + *

API Note + * + * Performance Note + *

By default, the window buffer in the current operating system is accessed via the CPU. If an application + * does not need to access the window buffer data using the CPU, it can proactively disable CPU access to + * enhance energy efficiency and reduce power consumption. + *

+ *

For details about how to optimize power consumption for data read/write operations in data buffers, + * see [How do I proactively disable CPU access to window buffers to reduce power consumption?]{@link https://developer.huawei.com/consumer/en/doc/harmonyos-faqs/faqs-arkgraphics-2d-14}.

+ *

+ * + */ void (*OnSurfaceCreated)(OH_NativeXComponent* component, void* window); /** Called when the surface is changed. */ void (*OnSurfaceChanged)(OH_NativeXComponent* component, void* window); -- Gitee From 870baebec56b318b447f7d24909e16683aabb5fb Mon Sep 17 00:00:00 2001 From: m00472246 Date: Mon, 21 Apr 2025 17:51:54 +0800 Subject: [PATCH 78/94] =?UTF-8?q?native=5Fimage=E6=96=B0=E5=A2=9E=E4=B8=A2?= =?UTF-8?q?=E5=B8=A7=E6=A8=A1=E5=BC=8F=20Signed-off-by:=20m00472246=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: m00472246 --- graphic/graphic_2d/native_image/native_image.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/graphic/graphic_2d/native_image/native_image.h b/graphic/graphic_2d/native_image/native_image.h index 744b367de..c9c4f5da8 100644 --- a/graphic/graphic_2d/native_image/native_image.h +++ b/graphic/graphic_2d/native_image/native_image.h @@ -352,22 +352,22 @@ int32_t OH_ConsumerSurface_SetDefaultUsage(OH_NativeImage* image, uint64_t usage int32_t OH_ConsumerSurface_SetDefaultSize(OH_NativeImage* image, int32_t width, int32_t height); /** - * @brief Set the rendering in real-time priority mode of the OH_NativeImage.\n - * In this mode, the most recent buffer is promptly rendered for display.\n + * @brief Set the rendering in drop buffer mode of the OH_NativeImage.\n + * In this mode, most of the buffers produced by the producer will be discarded, + * and the latest buffer will be selected for rending.\n * This mode can not simultaneously guarantee high frame rate requirements.\n - * After enabling this mode, setting the buffer queue size on the producer will not take effect.\n - * After this mode is enabled, it cannot be reverted to normal mode.\n - * This interface must be called after the OH_NativeImage_Create call immediately.\n + * This interface suggest be called after the OH_NativeImage_Create call immediately.\n * This interface is a non-thread-safe type interface.\n * * @syscap SystemCapability.Graphic.Graphic2D.NativeImage * @param image Indicates the pointer to a OH_NativeImage instance. + * @param isOpen Indicates the switch of drop buffer mode. * @return {@link NATIVE_ERROR_OK} 0 - Success. * {@link NATIVE_ERROR_INVALID_ARGUMENTS} 40001000 - image is NULL. * @since 17 * @version 1.0 */ -int32_t OH_NativeImage_SetRealTimePriorityMode(OH_NativeImage* image); +int32_t OH_NativeImage_SetDropBufferMode(OH_NativeImage* image, bool isOpen); #ifdef __cplusplus } #endif -- Gitee From bc1b0d639f0442e5d147787c843d6376c4fc7b73 Mon Sep 17 00:00:00 2001 From: m00472246 Date: Mon, 21 Apr 2025 17:57:29 +0800 Subject: [PATCH 79/94] =?UTF-8?q?native=5Fimage=E6=96=B0=E5=A2=9E=E4=B8=A2?= =?UTF-8?q?=E5=B8=A7=E6=A8=A1=E5=BC=8F=20Signed-off-by:=20m00472246=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: m00472246 --- graphic/graphic_2d/native_image/libnative_image.ndk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphic/graphic_2d/native_image/libnative_image.ndk.json b/graphic/graphic_2d/native_image/libnative_image.ndk.json index 3769a695f..0a09bba18 100644 --- a/graphic/graphic_2d/native_image/libnative_image.ndk.json +++ b/graphic/graphic_2d/native_image/libnative_image.ndk.json @@ -37,6 +37,6 @@ }, { "first_introduced": "17", - "name": "OH_NativeImage_SetRealTimePriorityMode" + "name": "OH_NativeImage_SetDropBufferMode" } ] \ No newline at end of file -- Gitee From f2e487e1fc3093a8483eaea31e399bd2f30b6685 Mon Sep 17 00:00:00 2001 From: m00472246 Date: Mon, 21 Apr 2025 19:22:37 +0800 Subject: [PATCH 80/94] =?UTF-8?q?native=5Fimage=E6=96=B0=E5=A2=9E=E4=B8=A2?= =?UTF-8?q?=E5=B8=A7=E6=A8=A1=E5=BC=8F=20Signed-off-by:=20m00472246=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: m00472246 --- graphic/graphic_2d/native_image/native_image.h | 1 + 1 file changed, 1 insertion(+) diff --git a/graphic/graphic_2d/native_image/native_image.h b/graphic/graphic_2d/native_image/native_image.h index c9c4f5da8..89935caed 100644 --- a/graphic/graphic_2d/native_image/native_image.h +++ b/graphic/graphic_2d/native_image/native_image.h @@ -357,6 +357,7 @@ int32_t OH_ConsumerSurface_SetDefaultSize(OH_NativeImage* image, int32_t width, * and the latest buffer will be selected for rending.\n * This mode can not simultaneously guarantee high frame rate requirements.\n * This interface suggest be called after the OH_NativeImage_Create call immediately.\n + * This interface will only take effect when used together with the OH_NativeImage_UpdateSurfaceImage.\n * This interface is a non-thread-safe type interface.\n * * @syscap SystemCapability.Graphic.Graphic2D.NativeImage -- Gitee From abcaa26d222bbb3076f73c7e91a021a0add3eef8 Mon Sep 17 00:00:00 2001 From: shilong Date: Tue, 22 Apr 2025 02:11:04 +0000 Subject: [PATCH 81/94] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=89=88=E6=9C=AC=E4=B8=BA18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shilong --- drivers/external_device_manager/scsi_peripheral/BUILD.gn | 2 +- drivers/external_device_manager/usb_serial/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/external_device_manager/scsi_peripheral/BUILD.gn b/drivers/external_device_manager/scsi_peripheral/BUILD.gn index a47545350..8165df363 100644 --- a/drivers/external_device_manager/scsi_peripheral/BUILD.gn +++ b/drivers/external_device_manager/scsi_peripheral/BUILD.gn @@ -23,7 +23,7 @@ ohos_ndk_headers("scsi_header") { ohos_ndk_library("libscsi") { ndk_description_file = "./libscsi.ndk.json" - min_compact_version = "16" + min_compact_version = "18" output_name = "scsi" system_capability = "SystemCapability.Driver.SCSI.Extension" system_capability_headers = [ diff --git a/drivers/external_device_manager/usb_serial/BUILD.gn b/drivers/external_device_manager/usb_serial/BUILD.gn index 0e47d0d1b..dda999ca9 100644 --- a/drivers/external_device_manager/usb_serial/BUILD.gn +++ b/drivers/external_device_manager/usb_serial/BUILD.gn @@ -23,7 +23,7 @@ ohos_ndk_headers("usb_serial_header") { ohos_ndk_library("libusb_serial") { ndk_description_file = "./libusb_serial.ndk.json" - min_compact_version = "16" + min_compact_version = "18" output_name = "usb_serial_ndk" system_capability = "SystemCapability.Driver.UsbSerial.Extension" system_capability_headers = [ -- Gitee From 0df542ded4a63a996ffd871d8ed65e76affe23a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=B4=E9=A3=8E?= Date: Wed, 16 Apr 2025 22:40:20 +0800 Subject: [PATCH 82/94] add new audio format related apis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨临风 --- multimedia/audio_framework/BUILD.gn | 2 + .../native_audio_stream_manager.h | 97 +++++++++++++++++++ .../common/native_audiostream_base.h | 74 +++++++++++++- multimedia/audio_framework/ohaudio.ndk.json | 8 ++ 4 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 multimedia/audio_framework/audio_manager/native_audio_stream_manager.h diff --git a/multimedia/audio_framework/BUILD.gn b/multimedia/audio_framework/BUILD.gn index e3a53b3cf..4c1cee6ca 100644 --- a/multimedia/audio_framework/BUILD.gn +++ b/multimedia/audio_framework/BUILD.gn @@ -21,6 +21,7 @@ ohos_ndk_headers("ohaudio_header") { "audio_manager/native_audio_manager.h", "audio_manager/native_audio_routing_manager.h", "audio_manager/native_audio_session_manager.h", + "audio_manager/native_audio_stream_manager.h", "audio_renderer/native_audiorenderer.h", "common/native_audio_common.h", "common/native_audio_device_base.h", @@ -44,5 +45,6 @@ ohos_ndk_library("libohaudio_ndk") { "ohaudio/native_audio_common.h", "ohaudio/native_audio_device_base.h", "ohaudio/native_audio_session_manager.h", + "ohaudio/native_audio_stream_manager.h", ] } diff --git a/multimedia/audio_framework/audio_manager/native_audio_stream_manager.h b/multimedia/audio_framework/audio_manager/native_audio_stream_manager.h new file mode 100644 index 000000000..8354c52d1 --- /dev/null +++ b/multimedia/audio_framework/audio_manager/native_audio_stream_manager.h @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup OHAudio + * @{ + * + * @brief Provide the definition of the C interface for the audio module. + * + * @syscap SystemCapability.Multimedia.Audio.Core + * + * @since 19 + */ + +/** + * @file native_audio_stream_manager.h + * + * @brief Declare audio stream manager related interfaces. + * + * This file interface is used for the creation of audioStreamManager + * as well as the audio stream settings and management. + * + * @library libohaudio.so + * @syscap SystemCapability.Multimedia.Audio.Core + * @kit AudioKit + * @since 19 + */ + +#ifndef NATIVE_AUDIO_STREAM_MANAGER_H +#define NATIVE_AUDIO_STREAM_MANAGER_H + +#include "native_audio_common.h" +#include "native_audiostream_base.h" +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Declare the audio stream manager. + * Audio stream manager provides many functions about audio streams, like monitoring audio streams status, + * getting different stream types supported information and so on. + * + * @since 19 + */ +typedef struct OH_AudioStreamManager OH_AudioStreamManager; + +/** + * @brief Fetch the audio streammanager handle, which is a singleton. + * + * @param streamManager output parameter to get the {@link #OH_AudioStreamManager}. + * @return + * {@link #AUDIOCOMMON_RESULT_SUCCESS} if execution succeeds + * {@link #AUDIOCOMMON_RESULT_ERROR_SYSTEM} if system state error + * @since 19 + */ +OH_AudioCommon_Result OH_AudioManager_GetAudioStreamManager(OH_AudioStreamManager **streamManager); + +/** + * @brief Gets the mode of direct playback available for a given audio format with current active device. + * + * @param audioStreamManager the {@link OH_AudioStreamManager} handle provided by + * {@link OH_AudioManager_GetAudioStreamManager}. + * @param streamInfo the {@link OH_AudioStreamInfo}. + * @param usage the {@link OH_AudioStream_Usage}. + * @param directPlaybackMode the {@link OH_AudioStream_DirectPlaybackMode} pointer to a variable which receives the + * result. + * @return Function result code: + * {@link AUDIOCOMMON_RESULT_SUCCESS} If the execution is successful. + * {@link AUDIOCOMMON_RESULT_ERROR_INVALID_PARAM}: + * 1.The param of audioStreamManager is nullptr; + * 2.The param of streamInfo is nullptr; + * 3.The param of usage invalid; + * 4.The param of directPlaybackMode is nullptr. + * @since 19 + */ +OH_AudioCommon_Result OH_AudioStreamManager_GetDirectPlaybackSupport( + OH_AudioStreamManager *audioStreamManager, OH_AudioStreamInfo *streamInfo, + OH_AudioStream_Usage usage, OH_AudioStream_DirectPlaybackMode *directPlaybackMode); + +#ifdef __cplusplus +} +#endif + +#endif // NATIVE_AUDIO_STREAM_MANAGER_H +/** @} */ diff --git a/multimedia/audio_framework/common/native_audiostream_base.h b/multimedia/audio_framework/common/native_audiostream_base.h index 6b1fb6cb6..15af99de7 100644 --- a/multimedia/audio_framework/common/native_audiostream_base.h +++ b/multimedia/audio_framework/common/native_audiostream_base.h @@ -41,6 +41,7 @@ #define NATIVE_AUDIOSTREAM_BASE_H #include +#include "multimedia/native_audio_channel_layout.h" #ifdef __cplusplus extern "C" { @@ -78,7 +79,14 @@ typedef enum { * * @since 10 */ - AUDIOSTREAM_ERROR_SYSTEM = 3 + AUDIOSTREAM_ERROR_SYSTEM = 3, + + /** + * @error Unsupported audio format, such as unsupported encoding type, sample format etc. + * + * @since 19 + */ + AUDIOSTREAM_ERROR_UNSUPPORTED_FORMAT = 4 } OH_AudioStream_Result; /** @@ -159,8 +167,46 @@ typedef enum { * @since 12 */ AUDIOSTREAM_ENCODING_TYPE_AUDIOVIVID = 1, + /** + * E_AC3 encoding type. + * + * @since 19 + */ + AUDIOSTREAM_ENCODING_TYPE_E_AC3 = 2, } OH_AudioStream_EncodingType; +/** + * @brief Define the audio stream info structure, used to describe basic audio format. + * + * @since 19 + */ +typedef struct OH_AudioStreamInfo { + /** + * @brief Audio sampling rate. + * + * @since 19 + */ + int32_t samplingRate; + /** + * @brief Audio channel layout. + * + * @since 19 + */ + OH_AudioChannelLayout channelLayout; + /** + * @brief Audio encoding format type. + * + * @since 19 + */ + OH_AudioStream_EncodingType encodingType; + /** + * @brief Audio sample format. + * + * @since 19 + */ + OH_AudioStream_SampleFormat sampleFormat; +} OH_AudioStreamInfo; + /** * @brief Define the audio stream usage. * Audio stream usage is used to describe what work scenario @@ -275,6 +321,32 @@ typedef enum { AUDIOSTREAM_LATENCY_MODE_FAST = 1 } OH_AudioStream_LatencyMode; +/** + * @brief Enumerates audio direct playback modes. + * + * @since 19 + */ +typedef enum { + /** + * Direct playback is not supported. + * + * @since 19 + */ + AUDIOSTREAM_DIRECT_PLAYBACK_NOT_SUPPORTED = 0, + /** + * Direct playback mode which is bitstream pass-through such as compressed pass-through. + * + * @since 19 + */ + AUDIOSTREAM_DIRECT_PLAYBACK_BITSTREAM_SUPPORTED = 1, + /** + * Direct playback mode of pcm. + * + * @since 19 + */ + AUDIOSTREAM_DIRECT_PLAYBACK_PCM_SUPPORTED = 2 +} OH_AudioStream_DirectPlaybackMode; + /** * @brief Define the audio event. * diff --git a/multimedia/audio_framework/ohaudio.ndk.json b/multimedia/audio_framework/ohaudio.ndk.json index 9366ddd75..de14c6407 100644 --- a/multimedia/audio_framework/ohaudio.ndk.json +++ b/multimedia/audio_framework/ohaudio.ndk.json @@ -410,5 +410,13 @@ { "first_introduced": "18", "name": "OH_AudioStreamBuilder_SetCapturerErrorCallback" + }, + { + "first_introduced": "19", + "name": "OH_AudioManager_GetAudioStreamManager" + }, + { + "first_introduced": "19", + "name": "OH_AudioStreamManager_GetDirectPlaybackSupport" } ] -- Gitee From 753459edb5cde806e1ceeec13ba1499701775538 Mon Sep 17 00:00:00 2001 From: wangqing Date: Fri, 18 Apr 2025 11:18:24 +0800 Subject: [PATCH 83/94] adjust API18 to API19 Signed-off-by: wangqing Change-Id: Ic4ecf2928248b85e41a02c7d55d32783db3ac565 --- hiviewdfx/hitrace/include/hitrace/trace.h | 86 +++++++++++------------ hiviewdfx/hitrace/libhitrace.ndk.json | 12 ++-- 2 files changed, 47 insertions(+), 51 deletions(-) diff --git a/hiviewdfx/hitrace/include/hitrace/trace.h b/hiviewdfx/hitrace/include/hitrace/trace.h index 4dcf2c51e..c5bf7c325 100644 --- a/hiviewdfx/hitrace/include/hitrace/trace.h +++ b/hiviewdfx/hitrace/include/hitrace/trace.h @@ -40,24 +40,6 @@ * * @brief Defines APIs of the HiTraceMeter module for performance trace. * - * Sample code: \n - * Synchronous timeslice trace event: \n - * OH_HiTrace_StartTrace("hitraceTest");\n - * OH_HiTrace_FinishTrace();\n - * Output: \n - * <...>-1668 (-------) [003] .... 135.059377: tracing_mark_write: B|1668|H:hitraceTest \n - * <...>-1668 (-------) [003] .... 135.059415: tracing_mark_write: E|1668| \n - * Asynchronous timeslice trace event:\n - * OH_HiTrace_StartAsyncTrace("hitraceTest", 123); \n - * OH_HiTrace_FinishAsyncTrace("hitraceTest", 123); \n - * Output: \n - * <...>-2477 (-------) [001] .... 396.427165: tracing_mark_write: S|2477|H:hitraceTest 123 \n - * <...>-2477 (-------) [001] .... 396.427196: tracing_mark_write: F|2477|H:hitraceTest 123 \n - * Integer value trace event:\n - * OH_HiTrace_CountTrace("hitraceTest", 500); \n - * Output: \n - * <...>-2638 (-------) [002] .... 458.904382: tracing_mark_write: C|2638|H:hitraceTest 500 \n - * * @library libhitracechain.so * @syscap SystemCapability.HiviewDFX.HiTrace * @since 10 @@ -297,37 +279,49 @@ typedef enum HiTrace_Communication_Mode { * @brief Enumerates the HiTrace output levels. The output level threshold system parameter determines * the minimum output trace. * - * @since 18 + * @atomicservice + * + * @since 19 */ typedef enum HiTrace_Output_Level { /** - * @brief Ouput level only for debug usage. + * @brief Output level only for debug usage. * - * @since 18 + * @atomicservice + * + * @since 19 */ HITRACE_LEVEL_DEBUG = 0, /** - * @brief Output level for beta version usage. + * @brief Output level for log version usage. + * + * @atomicservice * - * @since 18 + * @since 19 */ HITRACE_LEVEL_INFO = 1, /** - * @brief Output level for beta version usage, with higher priority than HITRACE_LEVEL_INFO. + * @brief Output level for log version usage, with higher priority than HITRACE_LEVEL_INFO. * - * @since 18 + * @atomicservice + * + * @since 19 */ HITRACE_LEVEL_CRITICAL = 2, /** - * @brief Output level for commercial version usage. + * @brief Output level for nolog version usage. + * + * @atomicservice * - * @since 18 + * @since 19 */ HITRACE_LEVEL_COMMERCIAL = 3, /** * @brief Output level for range limit. * - * @since 18 + * @atomicservice + * + * @since 19 */ HITRACE_LEVEL_MAX = HITRACE_LEVEL_COMMERCIAL, } HiTrace_Output_Level; @@ -729,23 +723,25 @@ void OH_HiTrace_CountTrace(const char *name, int64_t count); * The OH_HiTrace_StartTraceEx and OH_HiTrace_FinishTraceEx APIs must be used in pairs. * The two APIs can be used in nested mode. The stack data structure is used for matching during trace data parsing. * - * @param level Level of output priority. - * @param name Name of a trace task. - * @param customArgs key=value pair, multiple pairs use comma as seperator. + * @param level Trace output priority level. + * @param name Name of the synchronous trace task. + * @param customArgs key=value pair, multiple pairs use comma as separator. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_StartTraceEx(HiTrace_Output_Level level, const char* name, const char* customArgs); /** * @brief Marks the end of a synchronous trace task with output level control. * - * This API must be used with OH_HiTrace_StartTraceEx in pairs. During trace data parsing, the system matches - * it with the most recent OH_HiTrace_StartTraceEx API invocation in the service process. + * This API must be used with OH_HiTrace_StartTraceEx in pairs. The two APIs, which have the same level, + * form an synchronous timeslice trace task. + * During trace data parsing, the system matches it with the most recent OH_HiTrace_StartTraceEx API + * invocation in the service process. * - * @param level Level of output priority. + * @param level Trace output priority level. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_FinishTraceEx(HiTrace_Output_Level level); @@ -764,13 +760,13 @@ void OH_HiTrace_FinishTraceEx(HiTrace_Output_Level level); * If the trace tasks with the same name are not performed at the same time, the same taskId can be used. * Different processes's taskId do not interfere. * - * @param level Level of output priority. + * @param level Trace output priority level. * @param name Name of the asynchronous trace task. * @param taskId ID of the asynchronous trace task. * @param customCategory Label used to aggregate the asynchronous trace. - * @param customArgs key=value pair, multiple pairs use comma as seperator. + * @param customArgs key=value pair, multiple pairs use comma as separator. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_StartAsyncTraceEx(HiTrace_Output_Level level, const char* name, int32_t taskId, const char* customCategory, const char* customArgs); @@ -782,11 +778,11 @@ void OH_HiTrace_StartAsyncTraceEx(HiTrace_Output_Level level, const char* name, * It is used with OH_HiTrace_StartAsyncTraceEx in pairs. Its level, name, and task ID must be * the same as those of OH_HiTrace_StartAsyncTraceEx. * - * @param level Level of output priority. + * @param level Trace output priority level. * @param name Name of the asynchronous trace task. * @param taskId ID of the asynchronous trace task. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_FinishAsyncTraceEx(HiTrace_Output_Level level, const char* name, int32_t taskId); @@ -796,11 +792,11 @@ void OH_HiTrace_FinishAsyncTraceEx(HiTrace_Output_Level level, const char* name, * This API can be executed for multiple times to trace the value change of a given integer variable at different * time points. * - * @param level Level of output priority. + * @param level Trace output priority level. * @param name Name of the integer variable. It does not need to be the same as the real variable name. * @param count Integer value. Generally, an integer variable can be passed. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_CountTraceEx(HiTrace_Output_Level level, const char* name, int64_t count); @@ -809,9 +805,9 @@ void OH_HiTrace_CountTraceEx(HiTrace_Output_Level level, const char* name, int64 * * @return Returns whether the calling process is allowed to output trace. * @atomicservice - * @since 18 + * @since 19 */ -bool OH_HiTrace_IsTraceEnabled(); +bool OH_HiTrace_IsTraceEnabled(void); #ifdef __cplusplus } diff --git a/hiviewdfx/hitrace/libhitrace.ndk.json b/hiviewdfx/hitrace/libhitrace.ndk.json index ca73be360..5cf5a3451 100644 --- a/hiviewdfx/hitrace/libhitrace.ndk.json +++ b/hiviewdfx/hitrace/libhitrace.ndk.json @@ -99,27 +99,27 @@ "name": "OH_HiTrace_IdToBytes" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_StartTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_FinishTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_StartAsyncTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_FinishAsyncTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_CountTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_IsTraceEnabled" } ] \ No newline at end of file -- Gitee From 188e6e0ecb30c478b46c572dfa1145f6282fec61 Mon Sep 17 00:00:00 2001 From: b30058220 Date: Thu, 24 Apr 2025 09:47:26 +0800 Subject: [PATCH 84/94] =?UTF-8?q?imageSize=E4=BF=AE=E6=94=B9=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: b30058220 --- arkui/ace_engine/native/native_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 5d4d17691..005fd0888 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -1084,7 +1084,7 @@ typedef enum { typedef enum { /** The original image aspect ratio is retained. */ ARKUI_IMAGE_SIZE_AUTO = 0, - /** Default value. The image is scaled with its aspect ratio retained for both sides to be greater than or equal + /** The image is scaled with its aspect ratio retained for both sides to be greater than or equal * to the display boundaries. */ ARKUI_IMAGE_SIZE_COVER, /** The image is scaled with its aspect ratio retained for the content to be completely displayed within the display -- Gitee From e70b138dd297eebfc81af63537ab9d1bbf9ea758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=94=BF?= Date: Thu, 24 Apr 2025 20:55:52 +0800 Subject: [PATCH 85/94] xxxxx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李政 --- multimedia/camera_framework/camera.ndk.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/multimedia/camera_framework/camera.ndk.json b/multimedia/camera_framework/camera.ndk.json index cc333d328..372fb7615 100644 --- a/multimedia/camera_framework/camera.ndk.json +++ b/multimedia/camera_framework/camera.ndk.json @@ -650,5 +650,17 @@ { "first_introduced": "14", "name": "OH_CaptureSession_SetQualityPrioritization" + }, + { + "first_introduced": "18", + "name": "OH_CameraManager_GetCameraDevice" + }, + { + "first_introduced": "18", + "name": "OH_CameraManager_GetCameraConcurrentInfos" + }, + { + "first_introduced": "18", + "name": "OH_CameraInput_OpenConcurrentCameras" } ] -- Gitee From 318ff46876fdea16f55380279772c08db3d156fc Mon Sep 17 00:00:00 2001 From: yang-junfeng0621 Date: Mon, 28 Apr 2025 12:42:34 +0800 Subject: [PATCH 86/94] =?UTF-8?q?BUILD.GN=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang-junfeng0621 --- security/huks/BUILD.gn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/security/huks/BUILD.gn b/security/huks/BUILD.gn index 9c8b72985..4a8d8ea12 100644 --- a/security/huks/BUILD.gn +++ b/security/huks/BUILD.gn @@ -19,7 +19,12 @@ ohos_ndk_library("libhuks_ndk") { ndk_description_file = "./libhuks.ndk.json" min_compact_version = "1" - # system_capability = "SystemCapability.Security.Huks" + system_capability = "SystemCapability.Security.Huks" + system_capability_headers = [ + "./include/native_huks_api.h", + "./include/native_huks_param.h", + "./include/native_huks_type.h", + ] } ohos_ndk_headers("huks_header") { -- Gitee From ae7d9ac8ffb6dc11eceacdfa278283fd84ebc96f Mon Sep 17 00:00:00 2001 From: jango Date: Wed, 2 Apr 2025 16:06:35 +0800 Subject: [PATCH 87/94] Add macro interface Signed-off-by: jango --- multimedia/camera_framework/capture_session.h | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/multimedia/camera_framework/capture_session.h b/multimedia/camera_framework/capture_session.h index bbccf4e81..11f2af9c1 100644 --- a/multimedia/camera_framework/capture_session.h +++ b/multimedia/camera_framework/capture_session.h @@ -929,6 +929,31 @@ Camera_ErrorCode OH_CaptureSession_EnableAutoDeviceSwitch(Camera_CaptureSession* Camera_ErrorCode OH_CaptureSession_SetQualityPrioritization( Camera_CaptureSession* session, Camera_QualityPrioritization qualityPrioritization); +/** + * @brief Check whether macro ability is supported. + * + * @param session the {@link Camera_CaptureSession} instance. + * @param isSupported the result of whether macro ability supported. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. + * @since 17 + */ +Camera_ErrorCode OH_CaptureSession_IsMacroSupported(Camera_CaptureSession* session, bool* isSupported); + +/** + * @brief Enable macro ability or not for the camera device. + * + * @param session the {@link Camera_CaptureSession} instance. + * @param enabled the flag of enable macro ability or not. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. + * {@link #CAMERA_OPERATION_NOT_ALLOWED} if operation not allowed. + * @since 17 + */ +Camera_ErrorCode OH_CaptureSession_EnableMacro(Camera_CaptureSession* session, bool enabled); + #ifdef __cplusplus } #endif -- Gitee From 70af9df10fdb2d3821d6f6541f55282b6fd6123e Mon Sep 17 00:00:00 2001 From: jango Date: Mon, 7 Apr 2025 10:08:09 +0800 Subject: [PATCH 88/94] ndk.json add interface Signed-off-by: jango --- multimedia/camera_framework/camera.ndk.json | 8 ++++++++ multimedia/camera_framework/capture_session.h | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/multimedia/camera_framework/camera.ndk.json b/multimedia/camera_framework/camera.ndk.json index 372fb7615..e92a2841f 100644 --- a/multimedia/camera_framework/camera.ndk.json +++ b/multimedia/camera_framework/camera.ndk.json @@ -662,5 +662,13 @@ { "first_introduced": "18", "name": "OH_CameraInput_OpenConcurrentCameras" + }, + { + "first_introduced": "19", + "name": "OH_CaptureSession_IsMacroSupported" + }, + { + "first_introduced": "19", + "name": "OH_CaptureSession_EnableMacro" } ] diff --git a/multimedia/camera_framework/capture_session.h b/multimedia/camera_framework/capture_session.h index 11f2af9c1..15b1dce11 100644 --- a/multimedia/camera_framework/capture_session.h +++ b/multimedia/camera_framework/capture_session.h @@ -937,7 +937,7 @@ Camera_ErrorCode OH_CaptureSession_SetQualityPrioritization( * @return {@link #CAMERA_OK} if the method call succeeds. * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. - * @since 17 + * @since 19 */ Camera_ErrorCode OH_CaptureSession_IsMacroSupported(Camera_CaptureSession* session, bool* isSupported); @@ -950,7 +950,7 @@ Camera_ErrorCode OH_CaptureSession_IsMacroSupported(Camera_CaptureSession* sessi * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. * {@link #CAMERA_OPERATION_NOT_ALLOWED} if operation not allowed. - * @since 17 + * @since 19 */ Camera_ErrorCode OH_CaptureSession_EnableMacro(Camera_CaptureSession* session, bool enabled); -- Gitee From 3f6862a8a4abfe2c914e5eca79be7bc6b27b4eed Mon Sep 17 00:00:00 2001 From: jango Date: Tue, 29 Apr 2025 09:31:02 +0800 Subject: [PATCH 89/94] Update comments Signed-off-by: jango --- multimedia/camera_framework/capture_session.h | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/multimedia/camera_framework/capture_session.h b/multimedia/camera_framework/capture_session.h index 15b1dce11..93e77e118 100644 --- a/multimedia/camera_framework/capture_session.h +++ b/multimedia/camera_framework/capture_session.h @@ -930,26 +930,28 @@ Camera_ErrorCode OH_CaptureSession_SetQualityPrioritization( Camera_CaptureSession* session, Camera_QualityPrioritization qualityPrioritization); /** - * @brief Check whether macro ability is supported. - * - * @param session the {@link Camera_CaptureSession} instance. - * @param isSupported the result of whether macro ability supported. - * @return {@link #CAMERA_OK} if the method call succeeds. - * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. - * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. + * @brief Checks whether the macro capability is supported. + * + * @param session Pointer to an {@link Camera_CaptureSession} instance. + * @param isSupported Pointer to the check result. The value true means that the macro capability is supported, and false means the opposite. + * @return {@link Camera_ErrorCode}: + * CAMERA_OK = 0: The function call is successful.\n + * CAMERA_INVALID_ARGUMENT = 7400101: A parameter is missing or the parameter type is incorrect.\n + * CAMERA_SESSION_NOT_CONFIG = 7400103: The capture session is not configured. * @since 19 */ Camera_ErrorCode OH_CaptureSession_IsMacroSupported(Camera_CaptureSession* session, bool* isSupported); /** - * @brief Enable macro ability or not for the camera device. + * @brief Enables or disables the macro capability of the camera device. * - * @param session the {@link Camera_CaptureSession} instance. - * @param enabled the flag of enable macro ability or not. - * @return {@link #CAMERA_OK} if the method call succeeds. - * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. - * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. - * {@link #CAMERA_OPERATION_NOT_ALLOWED} if operation not allowed. + * @param session Pointer to an {@link Camera_CaptureSession} instance. + * @param enabled Whether to enable the macro capability. The value true means to enable the macro capability, and false means to disable it. + * @return {@link Camera_ErrorCode}: + * CAMERA_OK = 0: The function call is successful.\n + * CAMERA_INVALID_ARGUMENT = 7400101: A parameter is missing or the parameter type is incorrect.\n + * CAMERA_SESSION_NOT_CONFIG = 7400103: The capture session is not configured.\n + * CAMERA_OPERATION_NOT_ALLOWED = 7400102: The operation is not allowed. * @since 19 */ Camera_ErrorCode OH_CaptureSession_EnableMacro(Camera_CaptureSession* session, bool enabled); -- Gitee From 0ce20742dce6810baa0311caadddeeda84db252b Mon Sep 17 00:00:00 2001 From: tuxiaohang Date: Tue, 29 Apr 2025 15:31:56 +0800 Subject: [PATCH 90/94] =?UTF-8?q?=E8=A1=A5=E5=85=85syscap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue: https://gitee.com/openharmony/interface_sdk_c/issues/IC4XHR Signed-off-by: tuxiaohang Change-Id: Ib9637fabc3c02562d37718bd40dd5c5b486eb521 --- arkui/napi/BUILD.gn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arkui/napi/BUILD.gn b/arkui/napi/BUILD.gn index eea7bc451..f5867f115 100644 --- a/arkui/napi/BUILD.gn +++ b/arkui/napi/BUILD.gn @@ -19,6 +19,11 @@ ohos_ndk_library("libnapi_ndk") { ndk_description_file = "./libnapi.ndk.json" min_compact_version = "1" output_name = "ace_napi" + system_capability = "SystemCapability.ArkUI.ArkUI.Napi" + system_capability_headers = [ + "napi/common.h", + "napi/native_api.h", + ] } ohos_ndk_headers("napi_header") { -- Gitee From 05861b016009d9be5de22e5d4eb499dd20cf4a02 Mon Sep 17 00:00:00 2001 From: magekkkk Date: Tue, 29 Apr 2025 11:06:14 +0000 Subject: [PATCH 91/94] change api ver for volume mode Signed-off-by: magekkkk --- .../common/native_audiostream_base.h | 6 +++--- .../common/native_audiostreambuilder.h | 3 +-- multimedia/audio_framework/ohaudio.ndk.json | 2 +- multimedia/player_framework/avplayer.h | 21 ++++++++++--------- .../avplayer/libavplayer.ndk.json | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/multimedia/audio_framework/common/native_audiostream_base.h b/multimedia/audio_framework/common/native_audiostream_base.h index 44b94e83b..7792e064e 100644 --- a/multimedia/audio_framework/common/native_audiostream_base.h +++ b/multimedia/audio_framework/common/native_audiostream_base.h @@ -828,13 +828,13 @@ typedef OH_AudioData_Callback_Result (*OH_AudioRenderer_OnWriteDataCallback)(OH_ /** * @brief Define the audio stream volume mode. * - * @since 18 + * @since 19 */ typedef enum { /** * Indicates this audio stream volume will be affected by system volume, also the default behavior. * - * @since 18 + * @since 19 */ AUDIOSTREAM_VOLUMEMODE_SYSTEM_GLOBAL = 0, @@ -842,7 +842,7 @@ typedef enum { * Indicates this audio stream volume will be affected by app's individual volume percentage which set by yourself * using the app volume api. * - * @since 18 + * @since 19 */ AUDIOSTREAM_VOLUMEMODE_APP_INDIVIDUAL = 1 } OH_AudioStream_VolumeMode; diff --git a/multimedia/audio_framework/common/native_audiostreambuilder.h b/multimedia/audio_framework/common/native_audiostreambuilder.h index 799d066cd..4fd3502b0 100644 --- a/multimedia/audio_framework/common/native_audiostreambuilder.h +++ b/multimedia/audio_framework/common/native_audiostreambuilder.h @@ -390,8 +390,6 @@ OH_AudioStream_Result OH_AudioStreamBuilder_SetRendererWriteDataCallback(OH_Audi /** * Set the renderer volume mode of the stream client * - * @since 18 - * * @param builder Reference provided by OH_AudioStreamBuilder_Create() * @param volumeMode Set the volume mode for the renderer client. * @return Function result code: @@ -399,6 +397,7 @@ OH_AudioStream_Result OH_AudioStreamBuilder_SetRendererWriteDataCallback(OH_Audi * {@link AUDIOSTREAM_ERROR_INVALID_PARAM}: * 1.The param of builder is nullptr; * 2.The param of volumeMode invalid. + * @since 19 */ OH_AudioStream_Result OH_AudioStreamBuilder_SetVolumeMode(OH_AudioStreamBuilder* builder, OH_AudioStream_VolumeMode volumeMode); diff --git a/multimedia/audio_framework/ohaudio.ndk.json b/multimedia/audio_framework/ohaudio.ndk.json index de14c6407..abe2f9773 100644 --- a/multimedia/audio_framework/ohaudio.ndk.json +++ b/multimedia/audio_framework/ohaudio.ndk.json @@ -384,7 +384,7 @@ "name": "OH_AudioRenderer_GetAudioTimestampInfo" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_AudioStreamBuilder_SetVolumeMode" }, { diff --git a/multimedia/player_framework/avplayer.h b/multimedia/player_framework/avplayer.h index f87d5b2bc..3cd37c257 100644 --- a/multimedia/player_framework/avplayer.h +++ b/multimedia/player_framework/avplayer.h @@ -593,16 +593,17 @@ OH_AVErrCode OH_AVPlayer_SetOnInfoCallback(OH_AVPlayer *player, OH_AVPlayerOnInf OH_AVErrCode OH_AVPlayer_SetOnErrorCallback(OH_AVPlayer *player, OH_AVPlayerOnErrorCallback callback, void *userData); /** - * @brief Set volume mode of the player - * @param player Pointer to an OH_AVPlayer instance - * @param volumeMode The value {@link OH_AudioStream_VolumeMode} indicated volume mode of the player. - * @return Function result code. - * {@link AV_ERR_OK} if the execution is successful. - * {@link AV_ERR_INVALID_VAL} if input player is nullptr or volumeMode value is invalid. - * {@link AV_ERR_INVALID_STATE} function called in invalid state, should before prepare state. - * {@link AV_ERR_SERVICE_DIED} media service died, system error. - * @since 18 - * @version 1.0 + * @brief Sets the volume mode of the AVPlayer. + * @param player Pointer to an OH_AVPlayer instance. + * @param volumeMode Volume mode, which is defined in {@link OH_AudioStream_VolumeMode}. + * @return Result code. + * {@link AV_ERR_OK}: The execution is successful. + * {@link AV_ERR_INVALID_VAL}: The value of player is a null pointer or + * the value of volumeMode is invalid. + * {@link AV_ERR_INVALID_STATE}: The function is called in an incorrect state. + * This function should be called prior to prepare. + * {@link AV_ERR_SERVICE_DIED}: System errors such as media service breakdown. + * @since 19 */ OH_AVErrCode OH_AVPlayer_SetVolumeMode(OH_AVPlayer *player, OH_AudioStream_VolumeMode volumeMode); diff --git a/multimedia/player_framework/avplayer/libavplayer.ndk.json b/multimedia/player_framework/avplayer/libavplayer.ndk.json index 28f2b2b13..f0b48063e 100644 --- a/multimedia/player_framework/avplayer/libavplayer.ndk.json +++ b/multimedia/player_framework/avplayer/libavplayer.ndk.json @@ -136,7 +136,7 @@ "name": "OH_AVPlayer_SetAudioEffectMode" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_AVPlayer_SetVolumeMode" } ] \ No newline at end of file -- Gitee From 98a2b4bb91db8734c5d2f69c8d1337f42524b17a Mon Sep 17 00:00:00 2001 From: sunbees Date: Wed, 30 Apr 2025 09:28:17 +0800 Subject: [PATCH 92/94] xcomponent surfaceHolder api version change to 19 Signed-off-by: sunbees Change-Id: I772b3e1ad87533930387d7ae6eff480af2993b44 --- .../native/native_interface_xcomponent.h | 38 +++++++++---------- arkui/ace_engine/native/native_type.h | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arkui/ace_engine/native/native_interface_xcomponent.h b/arkui/ace_engine/native/native_interface_xcomponent.h index ba637bd4d..8d2a66804 100644 --- a/arkui/ace_engine/native/native_interface_xcomponent.h +++ b/arkui/ace_engine/native/native_interface_xcomponent.h @@ -912,7 +912,7 @@ int32_t OH_ArkUI_XComponent_StopImageAnalyzer(ArkUI_NodeHandle node); /** * @brief Provides an encapsulated OH_ArkUI_SurfaceHolder instance. * - * @since 18 + * @since 19 */ typedef struct OH_ArkUI_SurfaceHolder OH_ArkUI_SurfaceHolder; @@ -921,7 +921,7 @@ typedef struct OH_ArkUI_SurfaceHolder OH_ArkUI_SurfaceHolder; * * @param node Indicates the pointer to the XComponent node. * @return Returns the created OH_ArkUI_SurfaceHolder object's pointer. - * @since 18 + * @since 19 */ OH_ArkUI_SurfaceHolder* OH_ArkUI_SurfaceHolder_Create(ArkUI_NodeHandle node); @@ -929,7 +929,7 @@ OH_ArkUI_SurfaceHolder* OH_ArkUI_SurfaceHolder_Create(ArkUI_NodeHandle node); * @brief Disposes of a OH_ArkUI_SurfaceHolder object. * * @param node Indicates the pointer to OH_ArkUI_SurfaceHolder object needed to dispose. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceHolder_Dispose(OH_ArkUI_SurfaceHolder* surfaceHolder); @@ -942,7 +942,7 @@ void OH_ArkUI_SurfaceHolder_Dispose(OH_ArkUI_SurfaceHolder* surfaceHolder); * @return Returns the error code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SurfaceHolder_SetUserData(OH_ArkUI_SurfaceHolder* surfaceHolder, void* userData); @@ -951,14 +951,14 @@ int32_t OH_ArkUI_SurfaceHolder_SetUserData(OH_ArkUI_SurfaceHolder* surfaceHolder * * @param surfaceHolder Indicates the target OH_ArkUI_SurfaceHolder instance. * @return Returns the custom data. - * @since 18 + * @since 19 */ void* OH_ArkUI_SurfaceHolder_GetUserData(OH_ArkUI_SurfaceHolder* surfaceHolder); /** * @brief Define the surface lifecycle callback. * - * @since 18 + * @since 19 */ typedef struct OH_ArkUI_SurfaceCallback OH_ArkUI_SurfaceCallback; @@ -966,7 +966,7 @@ typedef struct OH_ArkUI_SurfaceCallback OH_ArkUI_SurfaceCallback; * @brief Create a OH_ArkUI_SurfaceCallback object. * * @return Returns the created OH_ArkUI_SurfaceCallback object's pointer. - * @since 18 + * @since 19 */ OH_ArkUI_SurfaceCallback* OH_ArkUI_SurfaceCallback_Create(); @@ -974,7 +974,7 @@ OH_ArkUI_SurfaceCallback* OH_ArkUI_SurfaceCallback_Create(); * @brief Disposes of a OH_ArkUI_SurfaceCallback object. * * @param callback Indicates the pointer to OH_ArkUI_SurfaceCallback object needed to dispose. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceCallback_Dispose(OH_ArkUI_SurfaceCallback* callback); @@ -984,7 +984,7 @@ void OH_ArkUI_SurfaceCallback_Dispose(OH_ArkUI_SurfaceCallback* callback); * @param callback Indicated the pointer to the surface callback. * @param onSurfaceCreated Indicates the surface created callback event * which will called when the surface is created. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceCallback_SetSurfaceCreatedEvent( OH_ArkUI_SurfaceCallback* callback, @@ -996,7 +996,7 @@ void OH_ArkUI_SurfaceCallback_SetSurfaceCreatedEvent( * @param callback Indicated the pointer to the surface callback. * @param onSurfaceChanged Indicates the surface changed callback event * which will called when the surface is changed. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceCallback_SetSurfaceChangedEvent( OH_ArkUI_SurfaceCallback* callback, @@ -1008,7 +1008,7 @@ void OH_ArkUI_SurfaceCallback_SetSurfaceChangedEvent( * @param callback Indicated the pointer to the surface callback. * @param onSurfaceDestroyed Indicates the surface destroyed callback event * which will called when the surface is destroyed. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceCallback_SetSurfaceDestroyedEvent( OH_ArkUI_SurfaceCallback* callback, @@ -1022,7 +1022,7 @@ void OH_ArkUI_SurfaceCallback_SetSurfaceDestroyedEvent( * @return Returns the status code of the execution. * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SurfaceHolder_AddSurfaceCallback( OH_ArkUI_SurfaceHolder* surfaceHolder, @@ -1037,7 +1037,7 @@ int32_t OH_ArkUI_SurfaceHolder_AddSurfaceCallback( * @return Returns the status code of the execution. * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SurfaceHolder_RemoveSurfaceCallback( OH_ArkUI_SurfaceHolder* surfaceHolder, @@ -1046,7 +1046,7 @@ int32_t OH_ArkUI_SurfaceHolder_RemoveSurfaceCallback( /** * @brief Forward declaration of OHNativeWindow. * - * @since 18 + * @since 19 */ typedef struct NativeWindow OHNativeWindow; @@ -1055,7 +1055,7 @@ typedef struct NativeWindow OHNativeWindow; * * @param surfaceHolder Indicates the pointer to this OH_ArkUI_SurfaceHolder instance. * @return Returns the nativeWindow associated with this OH_ArkUI_SurfaceHolder instance. - * @since 18 + * @since 19 */ OHNativeWindow* OH_ArkUI_XComponent_GetNativeWindow(OH_ArkUI_SurfaceHolder* surfaceHolder); @@ -1070,7 +1070,7 @@ OHNativeWindow* OH_ArkUI_XComponent_GetNativeWindow(OH_ArkUI_SurfaceHolder* surf * @return Returns the status code of the execution. * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if the node is invalid. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_XComponent_SetAutoInitialize(ArkUI_NodeHandle node, bool autoInitialize); @@ -1082,7 +1082,7 @@ int32_t OH_ArkUI_XComponent_SetAutoInitialize(ArkUI_NodeHandle node, bool autoIn * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if the node is invalid. * {@link ARKUI_ERROR_CODE_XCOMPONENT_STATE_INVALID} if the node has initialized. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_XComponent_Initialize(ArkUI_NodeHandle node); @@ -1094,7 +1094,7 @@ int32_t OH_ArkUI_XComponent_Initialize(ArkUI_NodeHandle node); * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if the node is invalid. * {@link ARKUI_ERROR_CODE_XCOMPONENT_STATE_INVALID} if the node has finalized. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_XComponent_Finalize(ArkUI_NodeHandle node); @@ -1106,7 +1106,7 @@ int32_t OH_ArkUI_XComponent_Finalize(ArkUI_NodeHandle node); * @return Returns the status code of the execution. * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if the node is invalid. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_XComponent_IsInitialized(ArkUI_NodeHandle node, bool* isInitialized); diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 005fd0888..ff4522e3c 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -2158,7 +2158,7 @@ typedef enum { ARKUI_ERROR_CODE_INTERNAL_ERROR = 100001, /** * @error The XComponent is in invalid state. - * @since 18 + * @since 19 */ ARKUI_ERROR_CODE_XCOMPONENT_STATE_INVALID = 103501, /** @error The component does not support specific properties or events. */ -- Gitee From ff4cb991b8322dcee3ecfb6a0900764d9d226992 Mon Sep 17 00:00:00 2001 From: liuguangsheng Date: Fri, 25 Apr 2025 15:55:40 +0800 Subject: [PATCH 93/94] =?UTF-8?q?=E5=AA=92=E4=BD=93=E5=BA=93=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=9C=A8AVRecorder=E5=BD=95=E5=88=B6=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=87=AA=E5=8A=A8=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuguangsheng --- multimedia/media_library/media_asset_base_capi.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/multimedia/media_library/media_asset_base_capi.h b/multimedia/media_library/media_asset_base_capi.h index 53380d6de..4c117ed68 100644 --- a/multimedia/media_library/media_asset_base_capi.h +++ b/multimedia/media_library/media_asset_base_capi.h @@ -246,7 +246,14 @@ typedef enum MediaLibrary_ResourceType { */ typedef enum MediaLibrary_ImageFileType { /*JPEG type*/ - MEDIA_LIBRARY_IMAGE_JPEG = 1 + MEDIA_LIBRARY_IMAGE_JPEG = 1, + + /** + * @brief MPEG type + * + * @since 19 + */ + MEDIA_LIBRARY_FILE_VIDEO = 3, } MediaLibrary_ImageFileType; /** -- Gitee From 51d9ef6128674480598d190b609f18c4202d6793 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Wed, 30 Apr 2025 18:15:55 +0800 Subject: [PATCH 94/94] add rotation angle Signed-off-by: wangweiyuan --- arkui/ace_engine/native/native_node.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index c1458a02f..c6ac33c6a 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -1963,6 +1963,25 @@ typedef enum { */ NODE_TRANSLATE_WITH_PERCENT = 103, + /** + * @brief Defines the rotate attribute about angle, which can be set, reset, and obtained as required through APIs. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].f32: rotation angle of the X-axis direction. The default value is 0.\n + * .value[1].f32: rotation angle of the Y-axis direction. The default value is 0.\n + * .value[2].f32: rotation angle of the Z-axis direction. The default value is 0.\n + * .value[3].f32: line of sight, that is, the distance from the viewpoint to the z=0 plane, in px. + * The default value is 0. \n + * \n + * Format of the return value {@link ArkUI_AttributeItem}:\n + * .value[0].f32: rotation angle of the X-axis direction.\n + * .value[1].f32: rotation angle of the Y-axis direction.\n + * .value[2].f32: rotation angle of the Z-axis direction.\n + * .value[3].f32: line of sight, that is, the distance from the viewpoint to the z=0 plane, in px. \n + * + */ + NODE_ROTATE_ANGLE = 104, + /** * @brief Defines the text content attribute, which can be set, reset, and obtained as required through APIs. * -- Gitee