From de164a2c32e369b445c36dd758047d060a16f9b7 Mon Sep 17 00:00:00 2001 From: Martin Sajti Date: Tue, 24 Jun 2025 12:06:38 +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 --- .../ets/ets/@ohos.app.ability.appManager.ets | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/frameworks/ets/ets/@ohos.app.ability.appManager.ets b/frameworks/ets/ets/@ohos.app.ability.appManager.ets index d88bb50d90b..84f7d3b7248 100644 --- a/frameworks/ets/ets/@ohos.app.ability.appManager.ets +++ b/frameworks/ets/ets/@ohos.app.ability.appManager.ets @@ -78,10 +78,10 @@ export class KeepAliveBundleInfoInner implements KeepAliveBundleInfo { export native function nativePreloadApplication(callback: AsyncCallbackWrapper, bundleName: string, userId: number, mode: PreloadMode, appIndex?: number): void; export function preloadApplication(bundleName: string, userId: number, mode: PreloadMode, appIndex?: number): Promise{ - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + let p:Promise = new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null): void =>{ if (err == null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -227,10 +227,10 @@ export function off(type: 'applicationState', observerId: number, callback: Asyn } export function off(type: 'applicationState', observerId: number): Promise { - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + let p:Promise = new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null): void =>{ if (err == null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -251,8 +251,8 @@ export function getAppMemorySize(callback: AsyncCallback): void }); } export function getAppMemorySize(): Promise { - let p = new Promise((resolve:(data:number)=>void, reject:(err: BusinessError | null)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + let p = new Promise((resolve:(data:number)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined): void =>{ if (err == null || err.code == 0) { resolve(data as number); } else { @@ -274,8 +274,8 @@ 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 myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ + let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined): void =>{ if (err == null || err.code == 0) { resolve(data as boolean); } else { @@ -297,8 +297,8 @@ 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 myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ + let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined): void =>{ if (err == null || err.code == 0) { resolve(data as boolean); } else { @@ -321,10 +321,10 @@ 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 myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + let p:Promise = new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null): void =>{ if (err == null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -336,10 +336,10 @@ export function killProcessesByBundleName(bundleName: string): Promise { return p; } export function killProcessesByBundleName(bundleName: string, clearPageStack: boolean, appIndex?: number): Promise { - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + let p:Promise = new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null): void =>{ if (err == null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -360,7 +360,7 @@ export function killProcessWithAccount(bundleName: string, accountId: number, ca } export function killProcessWithAccount(bundleName: string, accountId: number): Promise { let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + let myCall = new AsyncCallbackWrapper((err: BusinessError | null): void =>{ if (err == null || err.code == 0) { resolve(undefined); } else { @@ -379,7 +379,7 @@ export function killProcessWithAccount(bundleName: string, accountId: number, clearPageStack: boolean, appIndex?: number): Promise { let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + let myCall = new AsyncCallbackWrapper((err: BusinessError | null): void =>{ if (err == null || err.code == 0) { resolve(undefined); } else { @@ -402,7 +402,7 @@ export function getProcessMemoryByPid(pid: number, callback: AsyncCallback { let p = new Promise((resolve:(data:number)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined): void =>{ if (err == null || err.code == 0) { resolve(data as number); } else { @@ -444,7 +444,7 @@ export function isSharedBundleRunning(bundleName: string, versionCode: number, c } export function isSharedBundleRunning(bundleName: string, versionCode: number): Promise { let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined): void =>{ if (err == null || err.code == 0) { resolve(data as boolean); } else { @@ -461,7 +461,7 @@ export function isSharedBundleRunning(bundleName: string, versionCode: number): export native function nativeGetSupportedProcessCachePids(bundleName: string, callback: AsyncCallbackWrapper>) : void; export function getSupportedProcessCachePids(bundleName: string): Promise> { let p = new Promise>((resolve:(data:Array)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper>((err: BusinessError | null, data: Array | undefined)=>{ + let myCall = new AsyncCallbackWrapper>((err: BusinessError | null, data: Array | undefined): void =>{ if (err == null || err.code == 0) { resolve(data as Array); } else { @@ -478,7 +478,7 @@ export function getSupportedProcessCachePids(bundleName: string): Promise, callback: AsyncCallbackWrapper) : void; export function killProcessesInBatch(pids: Array) : Promise { let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + let myCall = new AsyncCallbackWrapper((err: BusinessError | null): void =>{ if (err == null || err.code == 0) { resolve(undefined); } else { @@ -495,7 +495,7 @@ export function killProcessesInBatch(pids: Array) : Promise { export native function nativeIsAppRunning(callback: AsyncCallbackWrapper, bundleName: string, appCloneIndex?: number) : void; export function isAppRunning(bundleName: string, appCloneIndex?: number): Promise { let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined): void =>{ if (err == null || err.code == 0) { resolve(data as boolean); } else { @@ -513,7 +513,7 @@ export native function nativeSetKeepAliveForBundle(bundleName: string, userId: number, enable: boolean, callback: AsyncCallbackWrapper) : void; export function setKeepAliveForBundle(bundleName: string, userId: number, enable: boolean): Promise { let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + let myCall = new AsyncCallbackWrapper((err: BusinessError | null): void =>{ if (err == null || err.code == 0) { resolve(undefined); } else { @@ -531,7 +531,7 @@ export native function nativeGetKeepAliveBundles(callback: AsyncCallbackWrapper< type: KeepAliveAppType, userId?: number) : void; export function getKeepAliveBundles(type: KeepAliveAppType, userId?: number): Promise> { let p = new Promise>((resolve:(data:Array)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper>((err: BusinessError | null, data: Array | undefined)=>{ + let myCall = new AsyncCallbackWrapper>((err: BusinessError | null, data: Array | undefined): void =>{ if (err == null || err.code == 0) { resolve(data as Array); } else { -- Gitee