From 9eb8b0f03b34ee4fda510ab264e7d53cfe84567f Mon Sep 17 00:00:00 2001 From: nadolskyanton Date: Tue, 15 Jul 2025 14:38:14 +0300 Subject: [PATCH] Fix promise type Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICKUYR Signed-off-by: nadolskyanton --- .../ets/@ohos.app.ability.InsightIntentContext.ets | 8 ++++---- .../@ohos.app.ability.InsightIntentExecutor.ets | 2 +- .../ets/ets/@ohos.app.ability.abilityManager.ets | 2 +- .../ets/ets/@ohos.app.ability.appManager.ets | 14 +++++++------- .../ets/ets/@ohos.app.ability.missionManager.ets | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets b/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets index 40a7569f487..4590140f401 100644 --- a/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets +++ b/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets @@ -28,8 +28,8 @@ export default class InsightIntentContext { p1.then((e: NullishType) => { let retError = e as BusinessError; callback(retError, undefined); - }, (err: BusinessError): void => { - callback(err, undefined); + }, (err: Error): void => { + callback(err as BusinessError, undefined); }); } @@ -45,8 +45,8 @@ export default class InsightIntentContext { } else { reject(retError); } - }).catch((err: BusinessError): void => { - reject(err); + }).catch((err: Error): void => { + reject(err as BusinessError); }); }); return p; diff --git a/frameworks/ets/ets/@ohos.app.ability.InsightIntentExecutor.ets b/frameworks/ets/ets/@ohos.app.ability.InsightIntentExecutor.ets index 74b5ec0da52..5cb48870831 100644 --- a/frameworks/ets/ets/@ohos.app.ability.InsightIntentExecutor.ets +++ b/frameworks/ets/ets/@ohos.app.ability.InsightIntentExecutor.ets @@ -116,4 +116,4 @@ export default class InsightIntentExecutor { let ret: insightIntent.ExecuteResult = {code: 0}; return ret; } -} \ No newline at end of file +} diff --git a/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets b/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets index de13d525636..f84f493ff2d 100644 --- a/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets +++ b/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets @@ -113,7 +113,7 @@ export default namespace abilityManager { } function isEmbeddedOpenAllowed(context: Context, appId: string): Promise { - return new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve:(data:boolean)=>void, reject:(err: Error)=>void):void => { let asyncCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ if (err == null || err.code == 0) { resolve(data as boolean); diff --git a/frameworks/ets/ets/@ohos.app.ability.appManager.ets b/frameworks/ets/ets/@ohos.app.ability.appManager.ets index 5995889d83f..3bfbaf25991 100644 --- a/frameworks/ets/ets/@ohos.app.ability.appManager.ets +++ b/frameworks/ets/ets/@ohos.app.ability.appManager.ets @@ -84,7 +84,7 @@ export class KeepAliveBundleInfoInner implements KeepAliveBundleInfo { export native function nativePreloadApplication(callback: AsyncCallbackWrapper, bundleName: string, userId: int, mode: PreloadMode, appIndex?: int): void; export function preloadApplication(bundleName: string, userId: int, mode: PreloadMode, appIndex?: int): Promise{ - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: Error)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ if (err == null || err.code == 0) { resolve(undefined); @@ -236,7 +236,7 @@ export function off(type: 'applicationState', observerId: int, callback: AsyncCa export function off(type: 'applicationState', observerId: int): Promise { nativeOffApplicationStateCheck(observerId); - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: Error)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ if (err == null || err.code == 0) { resolve(undefined); @@ -260,7 +260,7 @@ export function getAppMemorySize(callback: AsyncCallback): void }); } export function getAppMemorySize(): Promise { - let p = new Promise((resolve:(data:int)=>void, reject:(err: BusinessError | null)=>void):void => { + let p = new Promise((resolve:(data:int)=>void, reject:(err: Error)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: int | undefined)=>{ if (err == null || err.code == 0) { resolve(data as int); @@ -283,7 +283,7 @@ export function isRamConstrainedDevice(callback: AsyncCallback): void { }); } export function isRamConstrainedDevice(): Promise { - let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError | null)=>void):void => { + let p = new Promise((resolve:(data:boolean)=>void, reject:(err: Error)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ if (err == null || err.code == 0) { resolve(data as boolean); @@ -306,7 +306,7 @@ export function isRunningInStabilityTest(callback: AsyncCallback): void }); } export function isRunningInStabilityTest(): Promise { - let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError | null)=>void):void => { + let p = new Promise((resolve:(data:boolean)=>void, reject:(err: Error)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ if (err == null || err.code == 0) { resolve(data as boolean); @@ -330,7 +330,7 @@ export function killProcessesByBundleName(bundleName: string, callback: AsyncCal }); } export function killProcessesByBundleName(bundleName: string): Promise { - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: Error)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ if (err == null || err.code == 0) { resolve(undefined); @@ -345,7 +345,7 @@ export function killProcessesByBundleName(bundleName: string): Promise { return p; } export function killProcessesByBundleName(bundleName: string, clearPageStack: boolean, appIndex?: int): Promise { - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: Error)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ if (err == null || err.code == 0) { resolve(undefined); diff --git a/frameworks/ets/ets/@ohos.app.ability.missionManager.ets b/frameworks/ets/ets/@ohos.app.ability.missionManager.ets index ad2ec9c8f72..ed4909d6975 100644 --- a/frameworks/ets/ets/@ohos.app.ability.missionManager.ets +++ b/frameworks/ets/ets/@ohos.app.ability.missionManager.ets @@ -31,7 +31,7 @@ export default namespace missionManager { export function clearAllMissions(): Promise { let p: Promise = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError | null) => void): void => { + new Promise((resolve: (data: undefined) => void, reject: (err: Error) => void): void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { if (err == null || err.code == 0) { resolve(undefined); -- Gitee