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 de740d56fcba118d7639c9b44c60f80293d6c30b..4e62f6b2cd21cd070309d128817621d13c08bee4 100644 --- a/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installerInner.ets +++ b/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installerInner.ets @@ -112,9 +112,11 @@ 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 p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -125,9 +127,11 @@ export class BundleInstallerInner implements installer.BundleInstaller { 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 p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -152,9 +156,11 @@ 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 p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -165,9 +171,11 @@ export class BundleInstallerInner implements installer.BundleInstaller { 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 p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -192,9 +200,11 @@ 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 p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -207,7 +217,8 @@ export class BundleInstallerInner implements installer.BundleInstaller { let execFun = ():NullishType=>{ this.recoverNative(bundleName, emptyParam); } let p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -232,7 +243,8 @@ export class BundleInstallerInner implements installer.BundleInstaller { let execFun = ():NullishType=>{ this.uninstallByOwnParamNative(uninstallParam); } let p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -259,7 +271,8 @@ export class BundleInstallerInner implements installer.BundleInstaller { let execFun = ():NullishType=>{ this.updateBundleForSelfNative(hapFilePaths, installParam); } let p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -270,9 +283,11 @@ export class BundleInstallerInner implements installer.BundleInstaller { 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 p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -400,4 +415,4 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); return p; } -} \ No newline at end of file +} 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 1157bdc0f044ee3ac011f14985230ee3ebc30386..2afcbf5238a0f66a7ede12212f0976548d705e04 100644 --- a/interfaces/kits/ani/bundle_manager/ets/@ohos.bundle.bundleManager.ets +++ b/interfaces/kits/ani/bundle_manager/ets/@ohos.bundle.bundleManager.ets @@ -310,9 +310,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultBundleInfo: BundleInfo = e as BundleInfo; - callback(null, resultBundleInfo); + let r = new BusinessError(); + callback(r, resultBundleInfo); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultBundleInfo = new BundleInfoInner(); + callback(err as BusinessError, resultBundleInfo); }); } @@ -366,9 +368,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultBundleInfo: BundleInfo = e as BundleInfo; - callback(null, resultBundleInfo); + let r = new BusinessError(); + callback(r, resultBundleInfo); },(err: Error): void => { - callback(err as BusinessError, undefined); + let resultBundleInfo = new BundleInfoInner(); + callback(err as BusinessError, resultBundleInfo); }); } @@ -379,9 +383,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultBundleInfo: BundleInfo = e as BundleInfo; - callback(null, resultBundleInfo); + let r = new BusinessError(); + callback(r, resultBundleInfo); },(err: Error): void => { - callback(err as BusinessError, undefined); + let resultBundleInfo = new BundleInfoInner(); + callback(err as BusinessError, resultBundleInfo); }); } @@ -419,9 +425,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultBundleInfos: Array = e as Array; - callback(null, resultBundleInfos); + let r = new BusinessError(); + callback(r, resultBundleInfos); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultBundleInfos = new Array; + callback(err as BusinessError, resultBundleInfos); }); } @@ -432,9 +440,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultBundleInfos: Array = e as Array; - callback(null, resultBundleInfos); + let r = new BusinessError(); + callback(r, resultBundleInfos); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultBundleInfos = new Array; + callback(err as BusinessError, resultBundleInfos); }); } @@ -464,9 +474,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultApplicationInfos: Array = e as Array; - callback(null, resultApplicationInfos); + let r = new BusinessError(); + callback(r, resultApplicationInfos); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultApplicationInfos = new Array; + callback(err as BusinessError, resultApplicationInfos); }); } @@ -478,9 +490,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultApplicationInfos: Array = e as Array; - callback(null, resultApplicationInfos); + let r = new BusinessError(); + callback(r, resultApplicationInfos); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultApplicationInfos = new Array; + callback(err as BusinessError, resultApplicationInfos); }); } @@ -525,9 +539,10 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let isEnabled: boolean = e as boolean; - callback(null, isEnabled); + let r = new BusinessError(); + callback(r, isEnabled); }, (err: Error): void => { - callback(err as BusinessError, undefined); + callback(err as BusinessError, false); }); } @@ -557,9 +572,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultAbilityInfos: Array = e as Array; - callback(null, resultAbilityInfos); + let r = new BusinessError(); + callback(r, resultAbilityInfos); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultAbilityInfos = new Array; + callback(err as BusinessError, resultAbilityInfos); }); } @@ -571,9 +588,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultAbilityInfos: Array = e as Array; - callback(null, resultAbilityInfos); + let r = new BusinessError(); + callback(r, resultAbilityInfos); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultAbilityInfos = new Array; + callback(err as BusinessError, resultAbilityInfos); }); } @@ -603,9 +622,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultApplicationInfo: ApplicationInfo = e as ApplicationInfo; - callback(null, resultApplicationInfo); + let r = new BusinessError(); + callback(r, resultApplicationInfo); },(err: Error): void => { - callback(err as BusinessError, undefined); + let resultApplicationInfo = new ApplicationInfoInner(); + callback(err as BusinessError, resultApplicationInfo); }); } @@ -617,9 +638,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let resultApplicationInfo: ApplicationInfo = e as ApplicationInfo; - callback(null, resultApplicationInfo); + let r = new BusinessError(); + callback(r, resultApplicationInfo); },(err: Error): void => { - callback(err as BusinessError, undefined); + let resultApplicationInfo = new ApplicationInfoInner(); + callback(err as BusinessError, resultApplicationInfo); }); } @@ -667,9 +690,10 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let label: string = e as string; - callback(null, label); + let r = new BusinessError(); + callback(r, label); },(err: Error): void => { - callback(err as BusinessError, undefined); + callback(err as BusinessError, ""); }); } @@ -705,9 +729,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let want: Want = e as Want; - callback(null, want); + let r = new BusinessError(); + callback(r, want); },(err: Error): void => { - callback(err as BusinessError, undefined); + let want : Want = {}; + callback(err as BusinessError, want); }); } @@ -721,9 +747,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let want: Want = e as Want; - callback(null, want); + let r = new BusinessError(); + callback(r, want); },(err: Error): void => { - callback(err as BusinessError, undefined); + let want : Want = {}; + callback(err as BusinessError, want); }); } @@ -754,9 +782,10 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let result: string = e as string; - callback(null, result); + let r = new BusinessError(); + callback(r, result); }).catch((err: Error): void => { - callback(err as BusinessError, undefined); + callback(err as BusinessError, ""); }); } @@ -786,9 +815,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let extensionAbilityInfos: Array = e as Array; - callback(null, extensionAbilityInfos); + let r = new BusinessError(); + callback(r, extensionAbilityInfos); },(err: Error): void => { - callback(err as BusinessError, undefined); + let extensionAbilityInfos = new Array; + callback(err as BusinessError, extensionAbilityInfos); }); } @@ -801,9 +832,11 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let extensionAbilityInfos: Array = e as Array; - callback(null, extensionAbilityInfos); + let r = new BusinessError(); + callback(r, extensionAbilityInfos); },(err: Error): void => { - callback(err as BusinessError, undefined); + let extensionAbilityInfos = new Array; + callback(err as BusinessError, extensionAbilityInfos); }); } @@ -870,9 +903,10 @@ namespace bundleManager { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let isEnabled: boolean = e as boolean; - callback(null, isEnabled); + let r = new BusinessError(); + callback(r, isEnabled); }, (err: Error): void => { - callback(err as BusinessError, undefined); + callback(err as BusinessError, false); }); } @@ -914,7 +948,8 @@ namespace bundleManager { }; let p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -958,7 +993,8 @@ namespace bundleManager { }; let p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -1016,21 +1052,6 @@ namespace bundleManager { ); return p; } - function cleanBundleCacheFilesForSelf(): Promise { - let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { - let execFun = (): void => { - return bundleManager.cleanBundleCacheFilesForSelfNative(); - }; - let p1 = taskpool.execute(execFun); - p1.then((): void => { - resolve(undefined); - }, (err: Error): void => { - reject(err as BusinessError); - }); - } - ); - return p; - } } export default bundleManager; diff --git a/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets b/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets index 688c080886984768c5dca485a817adb117cc5c38..080201f15cedfce5541b91a269fccdba8ceea66a 100644 --- a/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets +++ b/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets @@ -48,20 +48,21 @@ namespace freeInstall { }; let p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }).catch((err: Error): void => { callback(err as BusinessError, undefined); }); } function setHapModuleUpgradeFlag(bundleName: string, moduleName: string, upgradeFlag: UpgradeFlag): Promise { - let p: Promise = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { + let p: Promise = new Promise((resolve: (v:PromiseLike) => void, reject: (error: Error) => void) : void => { let execFun = (): void => { freeInstall.setHapModuleUpgradeFlagNative(bundleName, moduleName, upgradeFlag); }; let p1 = taskpool.execute(execFun); p1.then((): void => { - resolve(undefined); + resolve(Promise.resolve()); }, (err: Error): void => { reject(err as BusinessError); }); @@ -76,9 +77,10 @@ namespace freeInstall { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let result: boolean = e as boolean; - callback(null, result); + let r = new BusinessError(); + callback(r, result); }, (err: Error): void => { - callback(err as BusinessError, undefined); + callback(err as BusinessError, false); }); } @@ -105,9 +107,11 @@ namespace freeInstall { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let result: BundlePackInfo = e as BundlePackInfo; - callback(null, result); + let r = new BusinessError(); + callback(r, result); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let result = new BundlePackInfoInner; + callback(err as BusinessError, result); }); } @@ -134,9 +138,11 @@ namespace freeInstall { let p1 = taskpool.execute(execFun); p1.then((e: NullishType) => { let result: DispatchInfo = e as DispatchInfo; - callback(null, result); + let r = new BusinessError(); + callback(r, result); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let result = new DispatchInfoInner; + callback(err as BusinessError, result); }); } 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 64a434a22040a02bc9019d0e5015a37dcc482453..b0bc9c9b8eb40d5292569d890373a075d849ff99 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 @@ -62,9 +62,11 @@ export default namespace launcherBundleManager { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultShortcutInfo: Array = e as Array; - callback(null, resultShortcutInfo); + let br: BusinessError = new BusinessError(); + callback(br, resultShortcutInfo); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultShortcutInfo: Array = new Array; + callback(err as BusinessError, resultShortcutInfo); }); } @@ -91,9 +93,11 @@ export default namespace launcherBundleManager { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultArray: Array = e as Array; - callback(null, resultArray); + let br: BusinessError = new BusinessError(); + callback(br, resultArray); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultArray: Array = new Array; + callback(err as BusinessError, resultArray); }); } @@ -124,9 +128,11 @@ export default namespace launcherBundleManager { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultArray: Array = e as Array; - callback(null, resultArray); + let br: BusinessError = new BusinessError(); + callback(br, resultArray); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultArray: Array = new Array; + callback(err as BusinessError, resultArray); }); } diff --git a/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets b/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets index dbfc5b64e5cf14e4a70138b4a04b42aa2c4ffc9e..4c53371e8f541146c164b0f0126e373a07d8682a 100644 --- a/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets +++ b/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets @@ -38,20 +38,21 @@ export default namespace overlay { }; let p1 = taskpool.execute(cb); p1.then(() => { - callback(null, undefined); + let br: BusinessError = new BusinessError(); + callback(br, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); } function setOverlayEnabled(moduleName: string, isEnabled: boolean): Promise { - let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void) : void => { + let p = new Promise((resolve: (v: PromiseLike) => void, reject: (error: BusinessError) => void) : void => { let cb = (): void => { return overlay.setOverlayEnabledNative(moduleName, isEnabled); }; let p1 = taskpool.execute(cb); p1.then((): void => { - resolve(undefined); + resolve(Promise.resolve()); }, (err: Error): void => { reject(err as BusinessError); }); @@ -66,20 +67,21 @@ export default namespace overlay { }; let p1 = taskpool.execute(cb); p1.then(() => { - callback(null, undefined); + let br: BusinessError = new BusinessError(); + callback(br, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); } function setOverlayEnabledByBundleName(bundleName: string, moduleName: string, isEnabled: boolean): Promise { - let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void) : void => { + let p = new Promise((resolve: (v: PromiseLike) => void, reject: (error: BusinessError) => void) : void => { let cb = (): void => { return overlay.setOverlayEnabledByBundleNameNative(bundleName, moduleName, isEnabled); }; let p1 = taskpool.execute(cb); p1.then((): void => { - resolve(undefined); + resolve(Promise.resolve()); }, (err: Error): void => { reject(err as BusinessError); }); @@ -95,9 +97,11 @@ export default namespace overlay { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let result: OverlayModuleInfo = e as OverlayModuleInfo; - callback(null, result); + let br: BusinessError = new BusinessError(); + callback(br, result); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let result: OverlayModuleInfo = new OverlayModuleInfoInner; + callback(err as BusinessError, result); }); } @@ -124,9 +128,11 @@ export default namespace overlay { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultArray: Array = e as Array; - callback(null, resultArray); + let br: BusinessError = new BusinessError(); + callback(br, resultArray); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultArray: Array = new Array; + callback(err as BusinessError, resultArray); }); } @@ -153,9 +159,11 @@ export default namespace overlay { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultArray: Array = e as Array; - callback(null, resultArray); + let br: BusinessError = new BusinessError(); + callback(br, resultArray); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultArray: Array = new Array; + callback(err as BusinessError, resultArray); }); } @@ -166,9 +174,11 @@ export default namespace overlay { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultArray: Array = e as Array; - callback(null, resultArray); + let br: BusinessError = new BusinessError(); + callback(br, resultArray); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultArray: Array = new Array; + callback(err as BusinessError, resultArray); }); } @@ -196,9 +206,11 @@ export default namespace overlay { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultArray: Array = e as Array; - callback(null, resultArray); + let br: BusinessError = new BusinessError(); + callback(br, resultArray); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultArray: Array = new Array; + callback(err as BusinessError, resultArray); }); } @@ -209,9 +221,11 @@ export default namespace overlay { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultArray: Array = e as Array; - callback(null, resultArray); + let br: BusinessError = new BusinessError(); + callback(br, resultArray); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultArray: Array = new Array; + callback(err as BusinessError, resultArray); }); } 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 652144da093d3e99113573f5d92f4d1a7139f95a..511f4a08afa6f80a91bff3e89c33d44108558ce8 100644 --- a/interfaces/kits/ani/resource_manager/ets/@ohos.bundle.bundleResourceManager.ets +++ b/interfaces/kits/ani/resource_manager/ets/@ohos.bundle.bundleResourceManager.ets @@ -75,9 +75,11 @@ export default namespace bundleResourceManager { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultArray: Array = e as Array; - callback(null, resultArray); + let br: BusinessError = new BusinessError(); + callback(br, resultArray); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultArray: Array = new Array; + callback(err as BusinessError, resultArray); }); } @@ -104,9 +106,11 @@ export default namespace bundleResourceManager { let p1 = taskpool.execute(cb); p1.then((e: NullishType) => { let resultArray: Array = e as Array; - callback(null, resultArray); + let br: BusinessError = new BusinessError(); + callback(br, resultArray); }, (err: Error): void => { - callback(err as BusinessError, undefined); + let resultArray: Array = new Array; + callback(err as BusinessError, resultArray); }); } @@ -125,4 +129,4 @@ export default namespace bundleResourceManager { }); return p; } -} \ No newline at end of file +} 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 7215ab5a77e45d30c581e01fcc2313bddaacde44..1eb662a66a7d22a7370ccdeabb9d1e42c75723b0 100644 --- a/interfaces/kits/ani/shortcut_manager/ets/@ohos.bundle.shortcutManager.ets +++ b/interfaces/kits/ani/shortcut_manager/ets/@ohos.bundle.shortcutManager.ets @@ -25,30 +25,28 @@ namespace shortcutManager { export native function getAllDesktopShortcutInfoNative(userId: number): Array; function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise { - let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { - let cb = (): NullishType => { - return shortcutManager.addDesktopShortcutInfoNative(shortcutInfo, userId); - } + let p:Promise = new Promise((resolve:(v:PromiseLike) =>void, reject: (error: Error) => void):void=> { + let cb = ():NullishType=>{shortcutManager.AddDesktopShortcutInfo(shortcutInfo, userId);return undefined;} let p1 = taskpool.execute(cb); - p1.then((): void => { - resolve(undefined); + p1.then(():void => { + resolve(Promise.resolve()); }, (err: Error): void => { - reject(err as BusinessError); + let br = err as BusinessError; + reject(br); }); }); return p; } function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise { - let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { - let cb = (): NullishType => { - return shortcutManager.deleteDesktopShortcutInfoNative(shortcutInfo, userId) - } + let p:Promise = new Promise((resolve:(v:PromiseLike) =>void, reject: (error: Error) => void):void=> { + let cb = ():NullishType=>{shortcutManager.DeleteDesktopShortcutInfo(shortcutInfo, userId);return undefined;} let p1 = taskpool.execute(cb); - p1.then((): void => { - resolve(undefined); + p1.then(():void => { + resolve(Promise.resolve()); }, (err: Error): void => { - reject(err as BusinessError); + let br = err as BusinessError; + reject(br); }); }); return p; diff --git a/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets b/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets index e1761ed4065fcc66d6a3243e8fc82ef0b7d36e0a..529146745c34a4c1d2dbae94d256e6bf565a7395 100644 --- a/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets +++ b/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets @@ -77,20 +77,21 @@ export default namespace zlib { }; let p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }).catch((err: Error): void => { callback(err as BusinessError, undefined); }); } export function compressFile(inFile: string, outFile: string, options: Options): Promise { - let p: Promise = new Promise((resolve: (v:undefined) => void, reject: (error: Error) => void) : void => { + let p: Promise = new Promise((resolve: (v:PromiseLike) => void, reject: (error: Error) => void) : void => { let execFun = (): void => { zlib.CompressFile(inFile, outFile, options); }; let p1 = taskpool.execute(execFun); p1.then((): void => { - resolve(undefined); + resolve(Promise.resolve()); }, (err: Error): void => { reject(err as BusinessError); }); @@ -106,7 +107,8 @@ export default namespace zlib { }; let p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }).catch((err: Error): void => { callback(err as BusinessError, undefined); }); @@ -118,7 +120,8 @@ export default namespace zlib { }; let p1 = taskpool.execute(execFun); p1.then(() => { - callback(null, undefined); + let r = new BusinessError(); + callback(r, undefined); }).catch((err: Error): void => { callback(err as BusinessError, undefined); }); @@ -126,13 +129,13 @@ export default namespace zlib { export function decompressFile(inFile: string, outFile: string, options?: Options): Promise { let optionsParam = options ?? new OptionsInner(); - let p: Promise = new Promise((resolve: (v:undefined) => void, reject: (error: Error) => void) : void => { + let p: Promise = new Promise((resolve: (v:PromiseLike) => void, reject: (error: Error) => void) : void => { let execFun = (): void => { zlib.DecompressFile(inFile, outFile, optionsParam); }; let p1 = taskpool.execute(execFun); p1.then((): void => { - resolve(undefined); + resolve(Promise.resolve()); }, (err: Error): void => { reject(err as BusinessError); }); @@ -326,4 +329,4 @@ export default namespace zlib { }); return p; } -} \ No newline at end of file +}