From e2321d54e3b210449ce13252ad0a708539429077 Mon Sep 17 00:00:00 2001 From: Martin Sajti Date: Mon, 14 Jul 2025 12:15:25 +0200 Subject: [PATCH] Fix function type optional param typecheck Fix erroneous code Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/IC4121 Change-Id: Ifba7614dc3c6f7c35c4a57f6bc8b18e6b51073ba Signed-off-by: Martin Sajti --- .../common_event/ets/@ohos.commonEventManager.ets | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/interfaces/kits/ani/common_event/ets/@ohos.commonEventManager.ets b/interfaces/kits/ani/common_event/ets/@ohos.commonEventManager.ets index 2105d466..a05a7b84 100644 --- a/interfaces/kits/ani/common_event/ets/@ohos.commonEventManager.ets +++ b/interfaces/kits/ani/common_event/ets/@ohos.commonEventManager.ets @@ -25,7 +25,7 @@ const ERROR_PARAM_INVALID = 401; const errorParamInvalid: BusinessError = {code: ERROR_PARAM_INVALID, data: "Invalid parameter"}; type ResolveCallback = (data: T) => void; -type RejectCallback = (err: Object) => void; +type RejectCallback = (err: Error) => void; namespace commonEventManager { loadLibrary("ani_commoneventmanager.z"); @@ -125,7 +125,7 @@ namespace commonEventManager { let result: CommonEventSubscriber = e as CommonEventSubscriber; hilog.info(0x0000, TAG, 'createSubscriber result.'); callback(null, result); - }, (error: Object): void => { + }, (error: Error): void => { hilog.error(0x0000, TAG, 'createSubscriber error.'); let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -207,7 +207,7 @@ namespace commonEventManager { let r: BusinessError = { code: resultCode.intValue(), data: undefined }; callback(r, undefined); } - }, (error: Object): void => { + }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); }); @@ -227,7 +227,7 @@ namespace commonEventManager { let err: BusinessError = { code: resultCode.intValue(), data: undefined }; reject(err); } - }, (error: Object): void => { + }, (error: Error): void => { hilog.error(0xD001202, TAG, 'removeStickyCommonEvent Promise error'); reject(error); }); @@ -245,7 +245,7 @@ namespace commonEventManager { let err: BusinessError = { code: resultCode.intValue(), data: undefined }; callback(err, undefined); } - }, (error: Object): void => { + }, (error: Error): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); }); @@ -262,7 +262,7 @@ namespace commonEventManager { let err: BusinessError = { code: resultCode.intValue(), data: undefined }; reject(err); } - }, (error: Object): void => { + }, (error: Error): void => { hilog.error(0xD001202, TAG, 'setStaticSubscriberState Promise error'); reject(error); }); @@ -281,7 +281,7 @@ namespace commonEventManager { let err: BusinessError = { code: resultCode.intValue(), data: undefined }; reject(err); } - }, (error: Object): void => { + }, (error: Error): void => { hilog.error(0xD001202, TAG, 'setStaticSubscriberStateExecute Promise error.'); reject(error); }); -- Gitee