From 2f6423d75c99776c923286685e8de892b465156c Mon Sep 17 00:00:00 2001 From: wanghao1717 Date: Fri, 15 Aug 2025 16:10:23 +0800 Subject: [PATCH 1/5] fix bug Signed-off-by: wanghao1717 --- multimodalinput/kits/c/input/oh_input_manager.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/multimodalinput/kits/c/input/oh_input_manager.h b/multimodalinput/kits/c/input/oh_input_manager.h index 7ff7bb15115..32432532486 100644 --- a/multimodalinput/kits/c/input/oh_input_manager.h +++ b/multimodalinput/kits/c/input/oh_input_manager.h @@ -1389,7 +1389,7 @@ Input_Result OH_Input_GetAxisEventSourceType(const Input_AxisEvent* axisEvent, I * * @param axisEvent Axis event object. For details, see {@Link Input_AxisEvent}. * @param windowId The windowId for the axis event. - * @return OH_Input_SetAxisEventDisplayY function result code. + * @return OH_Input_SetAxisEventWindowId function result code. * {@link INPUT_SUCCESS} Sets the Y coordinate of the axis event success.\n * {@link INPUT_PARAMETER_ERROR} The axisEvent is NULL.\n * @syscap SystemCapability.MultimodalInput.Input.Core @@ -1402,7 +1402,7 @@ Input_Result OH_Input_SetAxisEventWindowId(Input_AxisEvent* axisEvent, int32_t w * * @param axisEvent Axis event object. For details, see {@Link Input_AxisEvent}. * @param windowId The windowId for the axis event. - * @return OH_Input_GetAxisEventDisplayY function result code. + * @return OH_Input_GetAxisEventWindowId function result code. * {@link INPUT_SUCCESS} Obtains the Y coordinate of the axis event success.\n * {@link INPUT_PARAMETER_ERROR} The axisEvent is NULL or the displayY is NULL.\n * @syscap SystemCapability.MultimodalInput.Input.Core @@ -1415,7 +1415,7 @@ Input_Result OH_Input_GetAxisEventWindowId(const Input_AxisEvent* axisEvent, int * * @param axisEvent Axis event object. For details, see {@Link Input_AxisEvent}. * @param displayId The displayId for the axis event. - * @return OH_Input_SetAxisEventDisplayY function result code. + * @return OH_Input_SetAxisEventDisplayId function result code. * {@link INPUT_SUCCESS} Sets the Y coordinate of the axis event success.\n * {@link INPUT_PARAMETER_ERROR} The axisEvent is NULL.\n * @syscap SystemCapability.MultimodalInput.Input.Core @@ -1428,7 +1428,7 @@ Input_Result OH_Input_SetAxisEventDisplayId(Input_AxisEvent* axisEvent, int32_t * * @param axisEvent Axis event object. For details, see {@Link Input_AxisEvent}. * @param displayId The displayId for the axis event. - * @return OH_Input_GetAxisEventDisplayY function result code. + * @return OH_Input_GetAxisEventDisplayId function result code. * {@link INPUT_SUCCESS} Obtains the Y coordinate of the axis event success.\n * {@link INPUT_PARAMETER_ERROR} The axisEvent is NULL or the displayY is NULL.\n * @syscap SystemCapability.MultimodalInput.Input.Core @@ -1775,7 +1775,7 @@ void OH_Input_SetFinalKey(Input_Hotkey *hotkey, int32_t finalKey); * * @param hotkey Hotkey key object. * @param finalKeyCode Returns the key value of the decorated key. - * @return OH_Input_GetfinalKey status code, specifically, + * @return OH_Input_GetFinalKey status code, specifically, * {@link INPUT_SUCCESS} if the operation is successful;\n * {@link INPUT_PARAMETER_ERROR} The hotkey is NULL or the finalKeyCode is NULL;\n * {@Link INPUT_DEVICE_NOT_SUPPORTED} Capability not supported.\n @@ -1840,7 +1840,7 @@ void OH_Input_SetRepeat(Input_Hotkey* hotkey, bool isRepeat); * * @param hotkey Shortcut key object. * @param isRepeat Whether a key event is repeated. - * @return OH_Input_GetIsRepeat status code, specifically, + * @return OH_Input_GetRepeat status code, specifically, * {@link INPUT_SUCCESS} if the operation is successful;\n * {@link INPUT_PARAMETER_ERROR} otherwise;\n * {@Link INPUT_DEVICE_NOT_SUPPORTED} Capability not supported.\n @@ -2061,7 +2061,7 @@ Input_Result OH_Input_UnregisterDeviceListener(Input_DeviceListener* listener); /** * @brief Unregisters the listener for all device hot swap events. * - * @return OH_Input_UnregisterDeviceListener status code, specifically, + * @return OH_Input_UnregisterDeviceListeners status code, specifically, * {@link INPUT_SUCCESS} if the operation is successful;\n * {@link INPUT_SERVICE_EXCEPTION} if the service is abnormal. * @syscap SystemCapability.MultimodalInput.Input.Core -- Gitee From 538364d43a9c54161439e52cfeac35157d79d9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E5=9B=BD=E5=86=9B?= Date: Mon, 18 Aug 2025 09:28:31 +0800 Subject: [PATCH 2/5] add ABILITY_RUNTIME_ERROR_CODE_GET_APPLICATION_INFO_FAILED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 任国军 --- AbilityKit/ability_runtime/ability_runtime_common.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AbilityKit/ability_runtime/ability_runtime_common.h b/AbilityKit/ability_runtime/ability_runtime_common.h index 704d6c80fb9..7c2e98d4a63 100644 --- a/AbilityKit/ability_runtime/ability_runtime_common.h +++ b/AbilityKit/ability_runtime/ability_runtime_common.h @@ -138,6 +138,11 @@ typedef enum { * @since 17 */ ABILITY_RUNTIME_ERROR_CODE_APP_INSTANCE_KEY_NOT_SUPPORTED = 16000079, + /** + * @error Failed to obtain the target application information. + * @since 21 + */ + ABILITY_RUNTIME_ERROR_CODE_GET_APPLICATION_INFO_FAILED = 16000081, } AbilityRuntime_ErrorCode; #ifdef __cplusplus -- Gitee From 4febe8cdd4d3e4e2e4e848591b99712211268f8d Mon Sep 17 00:00:00 2001 From: ZhaoJinghui Date: Tue, 12 Aug 2025 19:44:29 +0800 Subject: [PATCH 3/5] add errcode desc Signed-off-by: ZhaoJinghui Change-Id: Id50022da6a812a08f9763ecf3ebcd525659253aa --- distributeddatamgr/relational_store/include/data_asset.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/distributeddatamgr/relational_store/include/data_asset.h b/distributeddatamgr/relational_store/include/data_asset.h index f791cbc9e81..85c4fbdf6ba 100644 --- a/distributeddatamgr/relational_store/include/data_asset.h +++ b/distributeddatamgr/relational_store/include/data_asset.h @@ -326,7 +326,9 @@ Data_Asset *OH_Data_Asset_CreateOne(void); * * @param asset Represents a pointer to an {@link Data_Asset} instance. * @return Returns the status code of the execution. Successful execution returns RDB_OK, - * while failure returns a specific error code. Specific error codes can be referenced {@link OH_Rdb_ErrCode}. + * while failure returns a specific error code. + * {@link RDB_OK} - success. + * Specific error codes can be referenced {@link OH_Rdb_ErrCode}. * @see Data_Asset, OH_Rdb_ErrCode. * @since 11 */ @@ -349,7 +351,9 @@ Data_Asset **OH_Data_Asset_CreateMultiple(uint32_t count); * @param assets Represents a pointer to an {@link Data_Asset} instance. * @param count Represents the count of {@link Data_Asset} to destroy. * @return Returns the status code of the execution. Successful execution returns RDB_OK, - * while failure returns a specific error code. Specific error codes can be referenced {@link OH_Rdb_ErrCode}. + * while failure returns a specific error code. + * {@link RDB_OK} - success. + * Specific error codes can be referenced {@link OH_Rdb_ErrCode}. * @see Data_Asset, OH_Rdb_ErrCode. * @since 11 */ -- Gitee From 5754725ed9202721c37625bb228df066515d4bc1 Mon Sep 17 00:00:00 2001 From: huangtianyu Date: Tue, 19 Aug 2025 01:48:39 +0000 Subject: [PATCH 4/5] update multimedia/player_framework/lowpower_audio_sink.h. Signed-off-by: huangtianyu --- multimedia/player_framework/lowpower_audio_sink.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/multimedia/player_framework/lowpower_audio_sink.h b/multimedia/player_framework/lowpower_audio_sink.h index 07f24a29998..226f1f17a29 100644 --- a/multimedia/player_framework/lowpower_audio_sink.h +++ b/multimedia/player_framework/lowpower_audio_sink.h @@ -258,20 +258,6 @@ OH_AVErrCode OH_LowPowerAudioSink_SetPlaybackSpeed(OH_LowPowerAudioSink* sink, c */ OH_AVErrCode OH_LowPowerAudioSink_ReturnSamples(OH_LowPowerAudioSink* sink, OH_AVSamplesBuffer* samples); -/** - * @brief Set the loudness gain for lowpower audio sink. - * - * @param {OH_LowPowerAudioSink*} sink Pointer to an OH_LowPowerAudioSink instance. - * @param {float} loudnessGain Loudness gain to set which changes from -90.0 to 24.0, expressing in dB. - * The default loudness gain is 0.0dB. - * @return Returns AV_ERR_OK if the gain is set successfully; - * otherwise, returns a specific error code as defined in {@link OH_AVErrCode} - * {@link AV_ERR_INVALID_VAL} the sink is nullptr or loudnessGain is out of valid range. - * {@link AV_ERR_SERVICE_DIED} media service is died. - * @since 20 - */ -OH_AVErrCode OH_LowPowerAudioSink_SetLoudnessGain(OH_LowPowerAudioSink* sink, float loudnessGain); - /** * @brief Regsister callback instance for lowpower audio sink. * -- Gitee From d83729d44fa6d03e0ccecd1f91aeebdac1251f44 Mon Sep 17 00:00:00 2001 From: huangtianyu Date: Tue, 19 Aug 2025 01:49:28 +0000 Subject: [PATCH 5/5] update multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json. Signed-off-by: huangtianyu --- .../lowpower_avsink/liblowpower_avsink.ndk.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json b/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json index 7e53713e491..079f642c5fb 100644 --- a/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json +++ b/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json @@ -67,10 +67,6 @@ "first_introduced": "20", "name": "OH_LowPowerAudioSink_ReturnSamples" }, - { - "first_introduced": "20", - "name": "OH_LowPowerAudioSink_SetLoudnessGain" - }, { "first_introduced": "20", "name": "OH_LowPowerAudioSink_RegisterCallback" -- Gitee