diff --git a/interfaces/kits/ani/app_control/ets/@ohos.bundle.appControl.ets b/interfaces/kits/ani/app_control/ets/@ohos.bundle.appControl.ets index 4bfabe7890f06aaa777d03c5ce896da243426f38..02cfc75b24e5d8947e958a9ba2ad7a818753670d 100644 --- a/interfaces/kits/ani/app_control/ets/@ohos.bundle.appControl.ets +++ b/interfaces/kits/ani/app_control/ets/@ohos.bundle.appControl.ets @@ -135,7 +135,7 @@ export default namespace appControl { return appControl.getDisposedStatusNative(appId, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: Want = e as Want; callback(null, result); }, (err: Error): void => { @@ -149,7 +149,7 @@ export default namespace appControl { return appControl.getDisposedStatusNative(appId, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: Want = e as Want; resolve(result); }, (err: Error): void => { diff --git a/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installer.ets b/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installer.ets index 34329f8b52f62a4e93d7872a88afcdb8bfb9ef7a..3b033b714755bd64d6944f5e9b4f6a61a30e31fd 100644 --- a/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installer.ets +++ b/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installer.ets @@ -25,7 +25,7 @@ namespace installer { return installer.getBundleInstallerNative(false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let installer: BundleInstaller = e as BundleInstaller; callback(null, installer); }, (err: Object): void => { @@ -38,7 +38,7 @@ namespace installer { return installer.getBundleInstallerNative(false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let installer: BundleInstaller = e as BundleInstaller; resolve(installer); }, (err: Error): void => { diff --git a/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installerInner.ets b/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installerInner.ets index fce7386b47bcb614eaed99ad33df870fbfff83d1..b77f4b20a327be1b5fa7684d7954312dcc4b2ed5 100644 --- a/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installerInner.ets +++ b/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installerInner.ets @@ -91,7 +91,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.installNative(hapFilePaths, params); } + let execFun = ():Any=>{ this.installNative(hapFilePaths, params); } let p1 = taskpool.execute(execFun); p1.then(():void => { resolve(undefined); @@ -104,7 +104,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { install(hapFilePaths: Array, installParam: installer.InstallParam, callback: AsyncCallback): void { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.installNative(hapFilePaths, installParam); } + let execFun = ():Any=>{ this.installNative(hapFilePaths, installParam); } let p1 = taskpool.execute(execFun); p1.then(() => { @@ -118,7 +118,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { install(hapFilePaths: Array, callback: AsyncCallback): void { let emptyParam = new InstallParamInner(); let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.installNative(hapFilePaths, emptyParam); } + let execFun = ():Any=>{ this.installNative(hapFilePaths, emptyParam); } let p1 = taskpool.execute(execFun); p1.then(() => { @@ -133,7 +133,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.uninstallNative(bundleName, params); } + let execFun = ():Any=>{ this.uninstallNative(bundleName, params); } let p1 = taskpool.execute(execFun); p1.then(():void => { resolve(undefined); @@ -146,7 +146,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { uninstall(bundleName: string, installParam: installer.InstallParam, callback: AsyncCallback): void { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.uninstallNative(bundleName, installParam); } + let execFun = ():Any=>{ this.uninstallNative(bundleName, installParam); } let p1 = taskpool.execute(execFun); p1.then(() => { @@ -160,7 +160,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { uninstall(bundleName: string, callback: AsyncCallback): void { let emptyParam = new InstallParamInner(); let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.uninstallNative(bundleName, emptyParam); } + let execFun = ():Any=>{ this.uninstallNative(bundleName, emptyParam); } let p1 = taskpool.execute(execFun); p1.then(() => { @@ -175,7 +175,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.recoverNative(bundleName, params); } + let execFun = ():Any=>{ this.recoverNative(bundleName, params); } let p1 = taskpool.execute(execFun); p1.then(():void => { resolve(undefined); @@ -188,7 +188,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { recover(bundleName: string, installParam: installer.InstallParam, callback: AsyncCallback): void { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.recoverNative(bundleName, installParam); } + let execFun = ():Any=>{ this.recoverNative(bundleName, installParam); } let p1 = taskpool.execute(execFun); p1.then(() => { @@ -202,7 +202,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { recover(bundleName: string, callback: AsyncCallback): void { let emptyParam = new InstallParamInner(); let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.recoverNative(bundleName, emptyParam); } + let execFun = ():Any=>{ this.recoverNative(bundleName, emptyParam); } let p1 = taskpool.execute(execFun); p1.then(() => { callback(null, undefined); @@ -214,7 +214,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { uninstall(uninstallParam: installer.UninstallParam): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.uninstallByOwnParamNative(uninstallParam); } + let execFun = ():Any=>{ this.uninstallByOwnParamNative(uninstallParam); } let p1 = taskpool.execute(execFun); p1.then(():void => { resolve(undefined); @@ -227,7 +227,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { uninstall(uninstallParam: installer.UninstallParam, callback: AsyncCallback): void { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.uninstallByOwnParamNative(uninstallParam); } + let execFun = ():Any=>{ this.uninstallByOwnParamNative(uninstallParam); } let p1 = taskpool.execute(execFun); p1.then(() => { callback(null, undefined); @@ -241,7 +241,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.updateBundleForSelfNative(hapFilePaths, params); } + let execFun = ():Any=>{ this.updateBundleForSelfNative(hapFilePaths, params); } let p1 = taskpool.execute(execFun); p1.then(():void => { resolve(undefined); @@ -254,7 +254,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { updateBundleForSelf(hapFilePaths: Array, installParam: installer.InstallParam, callback: AsyncCallback): void { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.updateBundleForSelfNative(hapFilePaths, installParam); } + let execFun = ():Any=>{ this.updateBundleForSelfNative(hapFilePaths, installParam); } let p1 = taskpool.execute(execFun); p1.then(() => { callback(null, undefined); @@ -267,7 +267,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { updateBundleForSelf(hapFilePaths: Array, callback: AsyncCallback): void { let emptyParam = new InstallParamInner(); let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.updateBundleForSelfNative(hapFilePaths, emptyParam); } + let execFun = ():Any=>{ this.updateBundleForSelfNative(hapFilePaths, emptyParam); } let p1 = taskpool.execute(execFun); p1.then(() => { @@ -282,7 +282,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.uninstallUpdatesNative(bundleName, params); } + let execFun = ():Any=>{ this.uninstallUpdatesNative(bundleName, params); } let p1 = taskpool.execute(execFun); p1.then(():void => { resolve(undefined); @@ -295,7 +295,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { addExtResource(bundleName: string, filePaths: Array): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.addExtResourceNative(bundleName, filePaths); } + let execFun = ():Any=>{ this.addExtResourceNative(bundleName, filePaths); } let p1 = taskpool.execute(execFun); p1.then(():void => { resolve(undefined); @@ -308,7 +308,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { removeExtResource(bundleName: string, moduleNames: Array): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.removeExtResourceNative(bundleName, moduleNames); } + let execFun = ():Any=>{ this.removeExtResourceNative(bundleName, moduleNames); } let p1 = taskpool.execute(execFun); p1.then(():void => { resolve(undefined); @@ -325,7 +325,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { let p = new Promise((resolve: (v:int) => void, reject: (error: BusinessError) => void):void => { let execFun = ():int=>{ return this.createAppCloneNative(bundleName, params); } let p1 = taskpool.execute(execFun); - p1.then((appIdx: NullishType) => { + p1.then((appIdx: Any) => { resolve(appIdx as int); }, (err: Error): void => { reject(err as BusinessError); @@ -343,7 +343,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { defaultParam.userId = option; } let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ + let execFun = ():Any=>{ this.destroyAppCloneNative(bundleName, appIndex, defaultParam); } let p1 = taskpool.execute(execFun); @@ -359,7 +359,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { installPreexistingApp(bundleName: string, userId?: int): Promise { let userIdNum = userId ?? -500; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { - let execFun = ():NullishType=>{ this.installPreexistingAppNative(bundleName, userIdNum); } + let execFun = ():Any=>{ this.installPreexistingAppNative(bundleName, userIdNum); } let p1 = taskpool.execute(execFun); p1.then(():void => { resolve(undefined); diff --git a/interfaces/kits/ani/bundle_manager/ets/@ohos.bundle.bundleManager.ets b/interfaces/kits/ani/bundle_manager/ets/@ohos.bundle.bundleManager.ets index 330b9f25cea404c7eb3bb3e872a52973df22f063..c785c99e2bfab74b24e3eaa6dc9559a846bbaa32 100644 --- a/interfaces/kits/ani/bundle_manager/ets/@ohos.bundle.bundleManager.ets +++ b/interfaces/kits/ani/bundle_manager/ets/@ohos.bundle.bundleManager.ets @@ -258,7 +258,7 @@ namespace bundleManager { export native function getProfileByAbilityNative(moduleName: string, abilityName: string, metadataName: string, profileType: AbilityProfileType, isSync: boolean): Array; - + export native function getPermissionDefNative(permissionName: string, isSync: boolean): PermissionDef; export native function cleanBundleCacheFilesNative(bundleName: string, appIndex: int): void; @@ -293,7 +293,7 @@ namespace bundleManager { export native function getExtResourceNative(bundleName: string): Array; export native function disableDynamicIconNative(bundleName: string, option: BundleOptions): void; - + export native function getDynamicIconInfoNative(bundleName: string): Array; export native function getAllDynamicIconInfoNative(userId: int): Array; @@ -309,7 +309,7 @@ namespace bundleManager { export native function getDeveloperIdsNative(appDistributionType: int): Array; export native function getAllPluginInfoNative(hostBundleName: string, userId: int): Array; - + export native function migrateDataNative(sourcePaths: Array, destinationPath: string): void; export native function getSandboxDataDir(bundleName: string, appIndex: int): string; @@ -317,7 +317,7 @@ namespace bundleManager { export native function getAppCloneIdentityBySandboxDataDir(sandboxDataDir: string): AppCloneIdentity; export native function getAbilityInfoNative(uri: string, abilityFlags: int): Array; - + function isApplicationEnabledSync(bundleName: string): boolean { return bundleManager.isApplicationEnabledNative(bundleName, 0, true); } @@ -382,7 +382,7 @@ namespace bundleManager { function getPermissionDefSync(permissionName: string): PermissionDef { return bundleManager.getPermissionDefNative(permissionName, true); } - + function getAppProvisionInfoSync(bundleName: string, userId?: int): AppProvisionInfo { let userIdInfo: int = userId ?? EMPTY_VALUE; return bundleManager.getAppProvisionInfoNative(bundleName, userIdInfo, true); @@ -404,7 +404,7 @@ namespace bundleManager { return bundleManager.getBundleInfoForSelfNative(bundleFlags, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfo: BundleInfo = e as BundleInfo; callback(null, resultBundleInfo); }, (err: Error): void => { @@ -418,7 +418,7 @@ namespace bundleManager { return bundleManager.getBundleInfoForSelfNative(bundleFlags, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfo: BundleInfo = e as BundleInfo; resolve(resultBundleInfo); }, (err: Error): void => { @@ -444,7 +444,7 @@ namespace bundleManager { return bundleManager.getBundleInfoNative(bundleName, bundleFlags, userIdInfo, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfo: BundleInfo = e as BundleInfo; resolve(resultBundleInfo); }, (err: Error): void => { @@ -460,7 +460,7 @@ namespace bundleManager { return bundleManager.getBundleInfoNative(bundleName, bundleFlags, EMPTY_VALUE, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfo: BundleInfo = e as BundleInfo; callback(null, resultBundleInfo); },(err: Error): void => { @@ -473,7 +473,7 @@ namespace bundleManager { return bundleManager.getBundleInfoNative(bundleName, bundleFlags, userId, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfo: BundleInfo = e as BundleInfo; callback(null, resultBundleInfo); },(err: Error): void => { @@ -497,7 +497,7 @@ namespace bundleManager { return bundleManager.getAllBundleInfoNative(bundleFlags, userIdInfo); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfos: Array = e as Array; resolve(resultBundleInfos); }, (err: Error): void => { @@ -513,7 +513,7 @@ namespace bundleManager { return bundleManager.getAllBundleInfoNative(bundleFlags, EMPTY_VALUE); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfos: Array = e as Array; callback(null, resultBundleInfos); }, (err: Error): void => { @@ -526,7 +526,7 @@ namespace bundleManager { return bundleManager.getAllBundleInfoNative(bundleFlags, userId); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfos: Array = e as Array; callback(null, resultBundleInfos); }, (err: Error): void => { @@ -542,7 +542,7 @@ namespace bundleManager { return bundleManager.getAllApplicationInfoNative(appFlags, userIdInfo); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultApplicationInfos: Array = e as Array; resolve(resultApplicationInfos); }, (err: Error): void => { @@ -558,7 +558,7 @@ namespace bundleManager { return bundleManager.getAllApplicationInfoNative(appFlags, EMPTY_VALUE); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultApplicationInfos: Array = e as Array; callback(null, resultApplicationInfos); }, (err: Error): void => { @@ -572,7 +572,7 @@ namespace bundleManager { return bundleManager.getAllApplicationInfoNative(appFlags, userId); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultApplicationInfos: Array = e as Array; callback(null, resultApplicationInfos); }, (err: Error): void => { @@ -586,7 +586,7 @@ namespace bundleManager { return bundleManager.isApplicationEnabledNative(bundleName, appIndex, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let isEnabled: boolean = e as boolean; resolve(isEnabled); }, (err: Error): void => { @@ -603,7 +603,7 @@ namespace bundleManager { return bundleManager.isApplicationEnabledNative(bundleName, 0, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let isEnabled: boolean = e as boolean; resolve(isEnabled); }, (err: Error): void => { @@ -619,7 +619,7 @@ namespace bundleManager { return bundleManager.isApplicationEnabledNative(bundleName, 0, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let isEnabled: boolean = e as boolean; callback(null, isEnabled); }, (err: Error): void => { @@ -635,7 +635,7 @@ namespace bundleManager { return bundleManager.queryAbilityInfoSyncNative(want, abilityFlags, userIdInfo, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultAbilityInfos: Array = e as Array; resolve(resultAbilityInfos); }, (err: Error): void => { @@ -651,7 +651,7 @@ namespace bundleManager { return bundleManager.queryAbilityInfoSyncNative(want, abilityFlags, EMPTY_VALUE, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultAbilityInfos: Array = e as Array; callback(null, resultAbilityInfos); }, (err: Error): void => { @@ -665,7 +665,7 @@ namespace bundleManager { return bundleManager.queryAbilityInfoSyncNative(want, abilityFlags, userId, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultAbilityInfos: Array = e as Array; callback(null, resultAbilityInfos); }, (err: Error): void => { @@ -681,7 +681,7 @@ namespace bundleManager { return bundleManager.getApplicationInfoNative(bundleName, appFlags, userIdInfo, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultApplicationInfo: ApplicationInfo = e as ApplicationInfo; resolve(resultApplicationInfo); }, (err: Error): void => { @@ -697,7 +697,7 @@ namespace bundleManager { return bundleManager.getApplicationInfoNative(bundleName, appFlags, EMPTY_VALUE, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultApplicationInfo: ApplicationInfo = e as ApplicationInfo; callback(null, resultApplicationInfo); },(err: Error): void => { @@ -711,7 +711,7 @@ namespace bundleManager { return bundleManager.getApplicationInfoNative(bundleName, appFlags, userId, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultApplicationInfo: ApplicationInfo = e as ApplicationInfo; callback(null, resultApplicationInfo); },(err: Error): void => { @@ -726,7 +726,7 @@ namespace bundleManager { return bundleManager.getAppCloneIdentityNative(uid); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultAppCloneIdentity: AppCloneIdentity = e as AppCloneIdentity; resolve(resultAppCloneIdentity); }, (err: Error): void => { @@ -744,7 +744,7 @@ namespace bundleManager { return bundleManager.getAbilityLabelNative(bundleName, moduleName, abilityName, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let label: string = e as string; resolve(label); }, (err: Error): void => { @@ -761,7 +761,7 @@ namespace bundleManager { return bundleManager.getAbilityLabelNative(bundleName, moduleName, abilityName, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let label: string = e as string; callback(null, label); },(err: Error): void => { @@ -777,7 +777,7 @@ namespace bundleManager { return bundleManager.getLaunchWantForBundleNative(bundleName, userIdInfo, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let want: Want = e as Want; resolve(want); }, (err: Error): void => { @@ -793,7 +793,7 @@ namespace bundleManager { return bundleManager.getLaunchWantForBundleNative(bundleName, userId, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let want: Want = e as Want; callback(null, want); },(err: Error): void => { @@ -806,7 +806,7 @@ namespace bundleManager { return bundleManager.getLaunchWantForBundleNative(bundleName, EMPTY_VALUE, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let want: Want = e as Want; callback(null, want); },(err: Error): void => { @@ -823,7 +823,7 @@ namespace bundleManager { return bundleManager.getAppCloneBundleInfoNative(bundleName, appIndex, bundleFlags, userIdInfo); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfo: BundleInfo = e as BundleInfo; resolve(resultBundleInfo); }, (err: Error): void => { @@ -839,7 +839,7 @@ namespace bundleManager { return bundleManager.getBundleNameByUidNative(uid, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: string = e as string; callback(null, result); }).catch((err: Error): void => { @@ -853,7 +853,7 @@ namespace bundleManager { return bundleManager.getBundleNameByUidNative(uid, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: string = e as string; resolve(result); }).catch((err: Error): void => { @@ -871,7 +871,7 @@ namespace bundleManager { want, extensionAbilityType, "", extensionAbilityFlags, EMPTY_VALUE, false, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let extensionAbilityInfos: Array = e as Array; callback(null, extensionAbilityInfos); },(err: Error): void => { @@ -886,7 +886,7 @@ namespace bundleManager { want, extensionAbilityType, "", extensionAbilityFlags, userId, false, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let extensionAbilityInfos: Array = e as Array; callback(null, extensionAbilityInfos); },(err: Error): void => { @@ -905,7 +905,7 @@ namespace bundleManager { want, extensionAbilityType, "", extensionAbilityFlags, userIdInfo, false, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let extensionAbilityInfos: Array = e as Array; resolve(extensionAbilityInfos); }, (err: Error): void => { @@ -922,7 +922,7 @@ namespace bundleManager { return bundleManager.isAbilityEnabledNative(info, appIndex, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let isEnabled: boolean = e as boolean; resolve(isEnabled); }, (err: Error): void => { @@ -939,7 +939,7 @@ namespace bundleManager { return bundleManager.isAbilityEnabledNative(info, 0, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let isEnabled: boolean = e as boolean; resolve(isEnabled); }, (err: Error): void => { @@ -955,7 +955,7 @@ namespace bundleManager { return bundleManager.isAbilityEnabledNative(info, 0, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let isEnabled: boolean = e as boolean; callback(null, isEnabled); }, (err: Error): void => { @@ -1058,7 +1058,7 @@ namespace bundleManager { return bundleManager.getDynamicIconNative(bundleName); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let icon: string = e as string; resolve(icon); }, (err: Error): void => { @@ -1077,7 +1077,7 @@ namespace bundleManager { return bundleManager.queryAbilityInfoWithWantsNative(wants, abilityFlags, userIdInfo); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultAbilityInfos: Array = e as Array; resolve(resultAbilityInfos); }, (err: Error): void => { @@ -1127,7 +1127,7 @@ namespace bundleManager { return bundleManager.getBundleArchiveInfoNative(hapFilePath, bundleFlags, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfo: BundleInfo = e as BundleInfo; callback(null, resultBundleInfo); }, (err: Error): void => { @@ -1142,7 +1142,7 @@ namespace bundleManager { return bundleManager.getBundleArchiveInfoNative(hapFilePath, bundleFlags, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfo: BundleInfo = e as BundleInfo; resolve(resultBundleInfo); }, (err: Error): void => { @@ -1161,7 +1161,7 @@ namespace bundleManager { return bundleManager.getProfileByAbilityNative(moduleName, abilityName, metadataNameInfo, AbilityProfileType.ABILITY_PROFILE, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let profile: Array = e as Array; resolve(profile); }, (err: Error): void => { @@ -1178,7 +1178,7 @@ namespace bundleManager { return bundleManager.getProfileByAbilityNative(moduleName, abilityName, metadataName, AbilityProfileType.ABILITY_PROFILE, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let profile: Array = e as Array; callback(null, profile); }, (err: Error): void => { @@ -1195,7 +1195,7 @@ namespace bundleManager { return bundleManager.getProfileByAbilityNative(moduleName, extensionAbilityName, metadataNameInfo, AbilityProfileType.EXTENSION_PROFILE, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let profile: Array = e as Array; resolve(profile); }, (err: Error): void => { @@ -1212,7 +1212,7 @@ namespace bundleManager { return bundleManager.getProfileByAbilityNative(moduleName, extensionAbilityName, metadataName, AbilityProfileType.EXTENSION_PROFILE, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let profile: Array = e as Array; callback(null, profile); }, (err: Error): void => { @@ -1227,7 +1227,7 @@ namespace bundleManager { return bundleManager.getPermissionDefNative(permissionName, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let permissionDef: PermissionDef = e as PermissionDef; resolve(permissionDef); }, (err: Error): void => { @@ -1243,7 +1243,7 @@ namespace bundleManager { return bundleManager.getPermissionDefNative(permissionName, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let permissionDef: PermissionDef = e as PermissionDef; callback(null, permissionDef); }, (err: Error): void => { @@ -1301,7 +1301,7 @@ namespace bundleManager { return bundleManager.getAllBundleCacheSizeNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let size: long = e as long; resolve(size); }, (err: Error): void => { @@ -1327,7 +1327,7 @@ namespace bundleManager { ); return p; } - + function getAppProvisionInfo(bundleName: string, userId?: int): Promise { let p = new Promise((resolve: (appProvisionInfo: AppProvisionInfo) => void, reject: (error: Error) => void) => { @@ -1336,7 +1336,7 @@ namespace bundleManager { return bundleManager.getAppProvisionInfoNative(bundleName, userIdInfo, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let appProvisionInfo: AppProvisionInfo = e as AppProvisionInfo; resolve(appProvisionInfo); }, (err: Error): void => { @@ -1352,7 +1352,7 @@ namespace bundleManager { return bundleManager.getAppProvisionInfoNative(bundleName, userId, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let appProvisionInfo: AppProvisionInfo = e as AppProvisionInfo; callback(null, appProvisionInfo); }, (err: Error): void => { @@ -1365,7 +1365,7 @@ namespace bundleManager { return bundleManager.getAppProvisionInfoNative(bundleName, EMPTY_VALUE, false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let appProvisionInfo: AppProvisionInfo = e as AppProvisionInfo; callback(null, appProvisionInfo); }, (err: Error): void => { @@ -1380,7 +1380,7 @@ namespace bundleManager { return bundleManager.getAllPreinstalledApplicationInfoNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let applicationInfo: Array = e as Array; resolve(applicationInfo); }, (err: Error): void => { @@ -1400,7 +1400,7 @@ namespace bundleManager { return bundleManager.getAllAppCloneBundleInfoNative(bundleName, bundleFlags, userIdInfo); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultBundleInfos: Array = e as Array; resolve(resultBundleInfos); }, (err: Error): void => { @@ -1418,7 +1418,7 @@ namespace bundleManager { return bundleManager.getAllSharedBundleInfoNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let sharedBundleInfos: Array = e as Array; resolve(sharedBundleInfos); }, (err: Error): void => { @@ -1434,7 +1434,7 @@ namespace bundleManager { return bundleManager.getAllSharedBundleInfoNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let sharedBundleInfos: Array = e as Array; callback(null, sharedBundleInfos); }, (err: Error): void => { @@ -1449,7 +1449,7 @@ namespace bundleManager { return bundleManager.getSharedBundleInfoNative(bundleName, moduleName); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let sharedBundleInfos: Array = e as Array; resolve(sharedBundleInfos); }, (err: Error): void => { @@ -1466,7 +1466,7 @@ namespace bundleManager { return bundleManager.getSharedBundleInfoNative(bundleName, moduleName); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let sharedBundleInfos: Array = e as Array; callback(null, sharedBundleInfos); }, (err: Error): void => { @@ -1481,7 +1481,7 @@ namespace bundleManager { return bundleManager.getExtResourceNative(bundleName); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let extResource: Array = e as Array; resolve(extResource); }, (err: Error): void => { @@ -1533,7 +1533,7 @@ namespace bundleManager { return bundleManager.getDynamicIconInfoNative(bundleName); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let dynamicIconInfos: Array = e as Array; resolve(dynamicIconInfos); }, (err: Error): void => { @@ -1552,7 +1552,7 @@ namespace bundleManager { return bundleManager.getAllDynamicIconInfoNative(userIdInfo); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let dynamicIconInfos: Array = e as Array; resolve(dynamicIconInfos); }, (err: Error): void => { @@ -1598,7 +1598,7 @@ namespace bundleManager { return bundleManager.getRecoverableApplicationInfoNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let applicationInfo: Array = e as Array; resolve(applicationInfo); }, (err: Error): void => { @@ -1614,7 +1614,7 @@ namespace bundleManager { return bundleManager.getRecoverableApplicationInfoNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let applicationInfo: Array = e as Array; callback(null, applicationInfo); }, (err: Error): void => { @@ -1646,7 +1646,7 @@ namespace bundleManager { return bundleManager.getAllPluginInfoNative(hostBundleName, userIdInfo); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let pluginBundleInfo: Array = e as Array; resolve(pluginBundleInfo); }, (err: Error): void => { @@ -1680,7 +1680,7 @@ namespace bundleManager { return bundleManager.getAbilityInfoNative(uri, abilityFlags); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let abilityInfos: Array = e as Array; resolve(abilityInfos); }, (err: Error): void => { diff --git a/interfaces/kits/ani/default_app_manager/ets/@ohos.bundle.defaultAppManager.ets b/interfaces/kits/ani/default_app_manager/ets/@ohos.bundle.defaultAppManager.ets index 435053eed3a62bcf545380aba03eff9b1d3f3bf4..351204ccfeb1b9c0882b7a785a07eb857d094ea7 100644 --- a/interfaces/kits/ani/default_app_manager/ets/@ohos.bundle.defaultAppManager.ets +++ b/interfaces/kits/ani/default_app_manager/ets/@ohos.bundle.defaultAppManager.ets @@ -50,7 +50,7 @@ export default namespace defaultAppManager { return defaultAppManager.isDefaultApplicationNative(type, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: boolean = e as boolean; callback(null, result); }, (err: Error): void => { @@ -65,7 +65,7 @@ export default namespace defaultAppManager { return defaultAppManager.isDefaultApplicationNative(type, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: boolean = e as boolean; resolve(result); }, (err: Error): void => { @@ -85,7 +85,7 @@ export default namespace defaultAppManager { return defaultAppManager.getDefaultApplicationNative(type, userId, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: BundleInfo = e as BundleInfo; callback(null, result); }, (err: Error): void => { @@ -98,7 +98,7 @@ export default namespace defaultAppManager { return defaultAppManager.getDefaultApplicationNative(type, EMPTY_USER_ID, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: BundleInfo = e as BundleInfo; callback(null, result); }, (err: Error): void => { @@ -113,7 +113,7 @@ export default namespace defaultAppManager { return defaultAppManager.getDefaultApplicationNative(type, userIdInfo, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: BundleInfo = e as BundleInfo; resolve(result); }, (err: Error): void => { diff --git a/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets b/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets index 7f939253c9425393da826a99d89e921164970d5e..bb0c9d0165a6447e1500917f3b8d8ce2f0126f21 100644 --- a/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets +++ b/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets @@ -74,7 +74,7 @@ namespace freeInstall { return freeInstall.isHapModuleRemovableNative(bundleName, moduleName); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: boolean = e as boolean; callback(null, result); }, (err: Error): void => { @@ -88,7 +88,7 @@ namespace freeInstall { return freeInstall.isHapModuleRemovableNative(bundleName, moduleName); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: boolean = e as boolean; resolve(result); }, (err: Error): void => { @@ -103,7 +103,7 @@ namespace freeInstall { return freeInstall.getBundlePackInfoNative(bundleName, bundlePackFlag); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: BundlePackInfo = e as BundlePackInfo; callback(null, result); }, (err: Error): void => { @@ -117,7 +117,7 @@ namespace freeInstall { return freeInstall.getBundlePackInfoNative(bundleName, bundlePackFlag); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: BundlePackInfo = e as BundlePackInfo; resolve(result); }, (err: Error): void => { @@ -132,7 +132,7 @@ namespace freeInstall { return freeInstall.getDispatchInfoNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: DispatchInfo = e as DispatchInfo; callback(null, result); }, (err: Error): void => { @@ -146,7 +146,7 @@ namespace freeInstall { return freeInstall.getDispatchInfoNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: DispatchInfo = e as DispatchInfo; resolve(result); }, (err: Error): void => { diff --git a/interfaces/kits/ani/launcher_bundle_manager/ets/@ohos.bundle.launcherBundleManager.ets b/interfaces/kits/ani/launcher_bundle_manager/ets/@ohos.bundle.launcherBundleManager.ets index 3a3b6246986542f4c93693f84d164f0408a82656..d7cb3dfe7f87a4370eb0dd8b6738f1ca16153ea2 100644 --- a/interfaces/kits/ani/launcher_bundle_manager/ets/@ohos.bundle.launcherBundleManager.ets +++ b/interfaces/kits/ani/launcher_bundle_manager/ets/@ohos.bundle.launcherBundleManager.ets @@ -36,7 +36,7 @@ export default namespace launcherBundleManager { if (options != undefined) { startOptions = options; } - let cb = (): NullishType => { + let cb = (): Any => { launcherBundleManager.startShortcutNative(shortcutInfo, startOptions); } let p1 = taskpool.execute(cb); @@ -62,7 +62,7 @@ export default namespace launcherBundleManager { return launcherBundleManager.getShortcutInfoNative(bundleName, EMPTY_USER_ID, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultShortcutInfo: Array = e as Array; callback(null, resultShortcutInfo); }, (err: Error): void => { @@ -76,7 +76,7 @@ export default namespace launcherBundleManager { return launcherBundleManager.getShortcutInfoNative(bundleName, EMPTY_USER_ID, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultShortcutInfo: Array = e as Array; resolve(resultShortcutInfo); }, (err: Error): void => { @@ -91,7 +91,7 @@ export default namespace launcherBundleManager { return launcherBundleManager.getLauncherAbilityInfoNative(bundleName, userId, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; callback(null, resultArray); }, (err: Error): void => { @@ -105,7 +105,7 @@ export default namespace launcherBundleManager { return launcherBundleManager.getLauncherAbilityInfoNative(bundleName, userId, false); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; resolve(resultArray); }, (err: Error): void => { @@ -124,7 +124,7 @@ export default namespace launcherBundleManager { return launcherBundleManager.getAllLauncherAbilityInfoNative(userId); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; callback(null, resultArray); }, (err: Error): void => { @@ -138,7 +138,7 @@ export default namespace launcherBundleManager { return launcherBundleManager.getAllLauncherAbilityInfoNative(userId); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; resolve(resultArray); }, (err: Error): void => { @@ -154,7 +154,7 @@ export default namespace launcherBundleManager { if (options != undefined) { startOptions = options; } - let cb = (): NullishType => { + let cb = (): Any => { launcherBundleManager.startShortcutWithReasonNative(shortcutInfo, startReason, startOptions); } let p1 = taskpool.execute(cb); diff --git a/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets b/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets index 73cd5d7f87263220a1dfac3229bd41d66de2b559..4793869064a8b0929e35b0d99ac17debd63b45b7 100644 --- a/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets +++ b/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets @@ -93,7 +93,7 @@ export default namespace overlay { return overlay.getOverlayModuleInfoNative(moduleName); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: OverlayModuleInfo = e as OverlayModuleInfo; callback(null, result); }, (err: Error): void => { @@ -107,7 +107,7 @@ export default namespace overlay { return overlay.getOverlayModuleInfoNative(moduleName); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: OverlayModuleInfo = e as OverlayModuleInfo; resolve(result); }, (err: Error): void => { @@ -122,7 +122,7 @@ export default namespace overlay { return overlay.getTargetOverlayModuleInfosNative(targetModuleName); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; callback(null, resultArray); }, (err: Error): void => { @@ -136,7 +136,7 @@ export default namespace overlay { return overlay.getTargetOverlayModuleInfosNative(targetModuleName); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; resolve(resultArray); }, (err: Error): void => { @@ -151,7 +151,7 @@ export default namespace overlay { return overlay.getOverlayModuleInfoByBundleNameNative(bundleName, ''); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; callback(null, resultArray); }, (err: Error): void => { @@ -164,7 +164,7 @@ export default namespace overlay { return overlay.getOverlayModuleInfoByBundleNameNative(bundleName, moduleName); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; callback(null, resultArray); }, (err: Error): void => { @@ -179,7 +179,7 @@ export default namespace overlay { return overlay.getOverlayModuleInfoByBundleNameNative(bundleName, moduleNameInfo); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; resolve(resultArray); }, (err: Error): void => { @@ -194,7 +194,7 @@ export default namespace overlay { return overlay.getTargetOverlayModuleInfosByBundleNameNative(targetBundleName, ''); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; callback(null, resultArray); }, (err: Error): void => { @@ -207,7 +207,7 @@ export default namespace overlay { return overlay.getTargetOverlayModuleInfosByBundleNameNative(targetBundleName, moduleName); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; callback(null, resultArray); }, (err: Error): void => { @@ -222,7 +222,7 @@ export default namespace overlay { return overlay.getTargetOverlayModuleInfosByBundleNameNative(targetBundleName, moduleNameInfo); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; resolve(resultArray); }, (err: Error): void => { diff --git a/interfaces/kits/ani/resource_manager/ets/@ohos.bundle.bundleResourceManager.ets b/interfaces/kits/ani/resource_manager/ets/@ohos.bundle.bundleResourceManager.ets index 72d828bcd71c2424e730a32b795055a31e1c0dce..df11b4cb297c68425f0781b33fa23b488c99f107 100644 --- a/interfaces/kits/ani/resource_manager/ets/@ohos.bundle.bundleResourceManager.ets +++ b/interfaces/kits/ani/resource_manager/ets/@ohos.bundle.bundleResourceManager.ets @@ -80,7 +80,7 @@ export default namespace bundleResourceManager { return bundleResourceManager.getAllBundleResourceInfoNative(resourceFlags); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; callback(null, resultArray); }, (err: Error): void => { @@ -94,7 +94,7 @@ export default namespace bundleResourceManager { return bundleResourceManager.getAllBundleResourceInfoNative(resourceFlags); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; resolve(resultArray); }, (err: Error): void => { @@ -109,7 +109,7 @@ export default namespace bundleResourceManager { return bundleResourceManager.getAllLauncherAbilityResourceInfoNative(resourceFlags); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; callback(null, resultArray); }, (err: Error): void => { @@ -123,7 +123,7 @@ export default namespace bundleResourceManager { return bundleResourceManager.getAllLauncherAbilityResourceInfoNative(resourceFlags); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; resolve(resultArray); }, (err: Error): void => { diff --git a/interfaces/kits/ani/shortcut_manager/ets/@ohos.bundle.shortcutManager.ets b/interfaces/kits/ani/shortcut_manager/ets/@ohos.bundle.shortcutManager.ets index 4c1ca71cf8e7048ed40ffd581f4cbf9ce718e45a..f90d43d3e55f72c274c735490ac7a4a4f2591043 100644 --- a/interfaces/kits/ani/shortcut_manager/ets/@ohos.bundle.shortcutManager.ets +++ b/interfaces/kits/ani/shortcut_manager/ets/@ohos.bundle.shortcutManager.ets @@ -28,7 +28,7 @@ namespace shortcutManager { function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise { let p = new Promise((resolve: (v: PromiseLike) => void, reject: (error: BusinessError) => void): void => { - let cb = (): NullishType => { + let cb = (): Any => { return shortcutManager.addDesktopShortcutInfoNative(shortcutInfo, userId); } let p1 = taskpool.execute(cb); @@ -43,7 +43,7 @@ namespace shortcutManager { function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise { let p = new Promise((resolve: (v: PromiseLike) => void, reject: (error: BusinessError) => void): void => { - let cb = (): NullishType => { + let cb = (): Any => { return shortcutManager.deleteDesktopShortcutInfoNative(shortcutInfo, userId) } let p1 = taskpool.execute(cb); @@ -62,7 +62,7 @@ namespace shortcutManager { return shortcutManager.getAllDesktopShortcutInfoNative(userId); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: Array = e as Array; resolve(result); }, (err: Error): void => { @@ -74,7 +74,7 @@ namespace shortcutManager { function setShortcutVisibleForSelf(id: string, visible: boolean): Promise { let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { - let cb = (): NullishType => { + let cb = (): Any => { return shortcutManager.setShortcutVisibleForSelfNative(id, visible); } let p1 = taskpool.execute(cb); @@ -93,7 +93,7 @@ namespace shortcutManager { return shortcutManager.getAllShortcutInfoForSelfNative(); }; let p1 = taskpool.execute(cb); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: Array = e as Array; resolve(result); }, (err: Error): void => { diff --git a/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets b/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets index bb431f88e4c30251193b6f3060443f563a1415ed..58378654b0f20f1ef1fba1fc26cbf071e27f01d8 100644 --- a/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets +++ b/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets @@ -191,7 +191,7 @@ export default namespace zlib { return this.adler32Native(adler, buf); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -207,7 +207,7 @@ export default namespace zlib { return this.adler32CombineNative(adler1, adler2, len2); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -223,7 +223,7 @@ export default namespace zlib { return this.crc32Native(crc, buf); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -239,7 +239,7 @@ export default namespace zlib { return this.crc32CombineNative(crc1, crc2, len2); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -255,7 +255,7 @@ export default namespace zlib { return this.crc64Native(crc, buf); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -271,7 +271,7 @@ export default namespace zlib { return this.getCrcTableNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; resolve(resultArray); }, (err: Error): void => { @@ -287,7 +287,7 @@ export default namespace zlib { return this.getCrc64TableNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let resultArray: Array = e as Array; resolve(resultArray); }, (err: Error): void => { @@ -378,7 +378,7 @@ export default namespace zlib { return this.gzbufferNative(size); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: int = e as int; resolve(result); }, (err: Error): void => { @@ -409,7 +409,7 @@ export default namespace zlib { return this.gzeofNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: int = e as int; resolve(result); }, (err: Error): void => { @@ -425,7 +425,7 @@ export default namespace zlib { return this.gzdirectNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: int = e as int; resolve(result); }, (err: Error): void => { @@ -441,7 +441,7 @@ export default namespace zlib { return this.gzcloseNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: ReturnStatus = e as ReturnStatus; resolve(result); }, (err: Error): void => { @@ -472,7 +472,7 @@ export default namespace zlib { return this.gzerrorNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: GzErrorOutputInfo = e as GzErrorOutputInfo; resolve(result); }, (err: Error): void => { @@ -488,7 +488,7 @@ export default namespace zlib { return this.gzgetcNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: int = e as int; resolve(result); }, (err: Error): void => { @@ -504,7 +504,7 @@ export default namespace zlib { return this.gzflushNative(flush); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: ReturnStatus = e as ReturnStatus; resolve(result); }, (err: Error): void => { @@ -520,7 +520,7 @@ export default namespace zlib { return this.gzfwriteNative(buf, size, nitems); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -536,7 +536,7 @@ export default namespace zlib { return this.gzfreadNative(buf, size, nitems); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -552,7 +552,7 @@ export default namespace zlib { return this.gzclosewNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: ReturnStatus = e as ReturnStatus; resolve(result); }, (err: Error): void => { @@ -568,7 +568,7 @@ export default namespace zlib { return this.gzcloserNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: ReturnStatus = e as ReturnStatus; resolve(result); }, (err: Error): void => { @@ -584,7 +584,7 @@ export default namespace zlib { return this.gzwriteNative(buf, len); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -600,7 +600,7 @@ export default namespace zlib { return this.gzungetcNative(c); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: int = e as int; resolve(result); }, (err: Error): void => { @@ -616,7 +616,7 @@ export default namespace zlib { return this.gztellNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -632,7 +632,7 @@ export default namespace zlib { return this.gzsetparamsNative(level, strategy); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: ReturnStatus = e as ReturnStatus; resolve(result); }, (err: Error): void => { @@ -648,7 +648,7 @@ export default namespace zlib { return this.gzseekNative(offset, whence); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -664,7 +664,7 @@ export default namespace zlib { return this.gzrewindNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: ReturnStatus = e as ReturnStatus; resolve(result); }, (err: Error): void => { @@ -680,7 +680,7 @@ export default namespace zlib { return this.gzreadNative(buf); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -696,7 +696,7 @@ export default namespace zlib { return this.gzputsNative(str); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: int = e as int; resolve(result); }, (err: Error): void => { @@ -712,7 +712,7 @@ export default namespace zlib { return this.gzputcNative(c); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: int = e as int; resolve(result); }, (err: Error): void => { @@ -728,7 +728,7 @@ export default namespace zlib { return this.gzprintfNative(format, ...args); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: int = e as int; resolve(result); }, (err: Error): void => { @@ -744,7 +744,7 @@ export default namespace zlib { return this.gzoffsetNative(); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -760,7 +760,7 @@ export default namespace zlib { return this.gzgetsNative(buf); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: string = e as string; resolve(result); }, (err: Error): void => { @@ -796,7 +796,7 @@ export default namespace zlib { return zlib.getOriginalSizeNative(compressedFile); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: long = e as long; resolve(result); }, (err: Error): void => { @@ -814,7 +814,7 @@ export default namespace zlib { return zlib.createChecksumNative(false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: Checksum = e as Checksum; resolve(result); }, (err: Error): void => { @@ -836,7 +836,7 @@ export default namespace zlib { return zlib.createGZipNative(false); }; let p1 = taskpool.execute(execFun); - p1.then((e: NullishType) => { + p1.then((e: Any) => { let result: GZip = e as GZip; resolve(result); }, (err: Error): void => {