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..fb044980fb7437ff55898adc81750fc21f8c5bf3 100644 --- a/interfaces/kits/ani/app_control/ets/@ohos.bundle.appControl.ets +++ b/interfaces/kits/ani/app_control/ets/@ohos.bundle.appControl.ets @@ -98,7 +98,7 @@ export default namespace appControl { export native function setDisposedRules(disposedRuleConfigurations: Array): void; - function setDisposedStatus(appId: string, disposedWant: Want, callback: AsyncCallback): void { + function setDisposedStatusWithAppIdDisposedWantCallback(appId: string, disposedWant: Want, callback: AsyncCallback): void { let cb = (): void => { return appControl.setDisposedStatusNative(appId, disposedWant, false); }; @@ -110,7 +110,7 @@ export default namespace appControl { }); } - function setDisposedStatus(appId: string, disposedWant: Want): Promise { + function setDisposedStatusWithAppIdDisposedWantReturnsPromise(appId: string, disposedWant: Want): Promise { let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void) : void => { let cb = (): void => { return appControl.setDisposedStatusNative(appId, disposedWant, false); @@ -126,11 +126,16 @@ export default namespace appControl { return p; } + overload setDisposedStatus { + setDisposedStatusWithAppIdDisposedWantCallback, + setDisposedStatusWithAppIdDisposedWantReturnsPromise + } + function setDisposedStatusSync(appId: string, disposedWant: Want): void { return appControl.setDisposedStatusNative(appId, disposedWant, true); } - function getDisposedStatus(appId: string, callback: AsyncCallback): void { + function getDisposedStatusWithAppIdCallback(appId: string, callback: AsyncCallback): void { let cb = (): Want => { return appControl.getDisposedStatusNative(appId, false); }; @@ -143,7 +148,7 @@ export default namespace appControl { }); } - function getDisposedStatus(appId: string): Promise { + function getDisposedStatusWithAppIdReturnsPromise(appId: string): Promise { let p = new Promise((resolve: (want: Want) => void, reject: (error: BusinessError) => void) => { let cb = (): Want => { return appControl.getDisposedStatusNative(appId, false); @@ -159,11 +164,16 @@ export default namespace appControl { return p; } + overload getDisposedStatus { + getDisposedStatusWithAppIdCallback, + getDisposedStatusWithAppIdReturnsPromise + } + function getDisposedStatusSync(appId: string): Want { return appControl.getDisposedStatusNative(appId, true); } - function deleteDisposedStatus(appId: string, callback: AsyncCallback): void { + function deleteDisposedStatusWithAppIdCallback(appId: string, callback: AsyncCallback): void { let cb = (): void => { return appControl.deleteDisposedStatusNative(appId, 0, false); }; @@ -175,7 +185,7 @@ export default namespace appControl { }); } - function deleteDisposedStatus(appId: string): Promise { + function deleteDisposedStatusWithAppIdReturnsPromise(appId: string): Promise { let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void) : void => { let cb = (): void => { return appControl.deleteDisposedStatusNative(appId, 0, false); @@ -191,6 +201,11 @@ export default namespace appControl { return p; } + overload deleteDisposedStatus { + deleteDisposedStatusWithAppIdCallback, + deleteDisposedStatusWithAppIdReturnsPromise + } + function deleteDisposedStatusSync(appId: string, appIndex?: int): void { let appIndexInfo = appIndex ?? 0; 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..ed79dfe5f25915577709ced7af79ef3e6371bce1 100644 --- a/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installer.ets +++ b/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installer.ets @@ -20,7 +20,7 @@ namespace installer { export native function getBundleInstallerNative(isSync: boolean): BundleInstaller; - function getBundleInstaller(callback: AsyncCallback): void { + function getBundleInstallerWithCallback(callback: AsyncCallback): void { let execFun = (): BundleInstaller => { return installer.getBundleInstallerNative(false); }; @@ -32,7 +32,7 @@ namespace installer { }); } - function getBundleInstaller(): Promise { + function getBundleInstallerReturnsPromise(): Promise { let p = new Promise((resolve: (bundleInstaller: BundleInstaller) => void, reject: (error: Error) => void) => { let execFun = (): BundleInstaller => { return installer.getBundleInstallerNative(false); @@ -49,39 +49,70 @@ namespace installer { return p; } + overload getBundleInstaller { + getBundleInstallerWithCallback, + getBundleInstallerReturnsPromise + } + function getBundleInstallerSync(): BundleInstaller { return installer.getBundleInstallerNative(true); } interface BundleInstaller { - install(hapFilePaths: Array, installParam: InstallParam, callback: AsyncCallback): void; + installWithHapFilePathsInstallParamCallback(hapFilePaths: Array, installParam: InstallParam, callback: AsyncCallback): void; - install(hapFilePaths: Array, callback: AsyncCallback): void; + installWithHapFilePathsCallback(hapFilePaths: Array, callback: AsyncCallback): void; - install(hapFilePaths: Array, installParam?: InstallParam): Promise; + installWithHapFilePathsInstallParamReturnsPromise(hapFilePaths: Array, installParam?: InstallParam): Promise; + + overload install { + installWithHapFilePathsInstallParamCallback, + installWithHapFilePathsCallback, + installWithHapFilePathsInstallParamReturnsPromise + } - uninstall(bundleName: string, installParam: InstallParam, callback: AsyncCallback): void; + uninstallWithBundleNameInstallParamCallback(bundleName: string, installParam: InstallParam, callback: AsyncCallback): void; - uninstall(bundleName: string, callback: AsyncCallback): void; + uninstallWithBundleNameCallback(bundleName: string, callback: AsyncCallback): void; + + uninstallWithBundleNameInstallParamReturnsPromise(bundleName: string, installParam?: InstallParam): Promise; + + recoverWithBundleNameInstallParamCallback(bundleName: string, installParam: InstallParam, callback: AsyncCallback): void; + + recoverWithBundleNameCallback(bundleName: string, callback: AsyncCallback): void; - uninstall(bundleName: string, installParam?: InstallParam): Promise; + recoverWithBundleNameInstallParamReturnsPromise(bundleName: string, installParam?: InstallParam): Promise; - recover(bundleName: string, installParam: InstallParam, callback: AsyncCallback): void; + overload recover { + recoverWithBundleNameInstallParamCallback, + recoverWithBundleNameCallback, + recoverWithBundleNameInstallParamReturnsPromise + } - recover(bundleName: string, callback: AsyncCallback): void; + uninstallWithUninstallParamCallback(uninstallParam: UninstallParam, callback: AsyncCallback): void; - recover(bundleName: string, installParam?: InstallParam): Promise; + uninstallWithUninstallParamReturnsPromise(uninstallParam: UninstallParam): Promise; - uninstall(uninstallParam: UninstallParam, callback: AsyncCallback): void; + overload uninstall { + uninstallWithBundleNameInstallParamCallback, + uninstallWithBundleNameCallback, + uninstallWithBundleNameInstallParamReturnsPromise, + uninstallWithUninstallParamCallback, + uninstallWithUninstallParamReturnsPromise + } - uninstall(uninstallParam: UninstallParam): Promise; + updateBundleForSelfWithHapFilePathsInstallParamCallback(hapFilePaths: Array, installParam: InstallParam, callback: AsyncCallback): void; - updateBundleForSelf(hapFilePaths: Array, installParam: InstallParam, callback: AsyncCallback): void; + updateBundleForSelfWithHapFilePathsCallback(hapFilePaths: Array, callback: AsyncCallback): void; - updateBundleForSelf(hapFilePaths: Array, callback: AsyncCallback): void; + updateBundleForSelfWithHapFilePathsInstallParamReturnsPromise(hapFilePaths: Array, installParam?: InstallParam): Promise; - updateBundleForSelf(hapFilePaths: Array, installParam?: InstallParam): Promise; + overload updateBundleForSelf { + updateBundleForSelfWithHapFilePathsInstallParamCallback, + updateBundleForSelfWithHapFilePathsCallback, + updateBundleForSelfWithHapFilePathsInstallParamReturnsPromise + } uninstallUpdates(bundleName: string, installParam?: InstallParam): Promise; 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..10d737d174808a38ac0028e4c7cfc2f67910abb0 100644 --- a/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installerInner.ets +++ b/interfaces/kits/ani/bundle_installer/ets/@ohos.bundle.installerInner.ets @@ -87,7 +87,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { native installPluginNative(hostBundleName: string, pluginFilePaths: Array, pluginParam: installer.PluginParam): void; native uninstallPluginNative(hostBundleName: string, pluginBundleName: string, pluginParam: installer.PluginParam): void; - install(hapFilePaths: Array, installParam?: installer.InstallParam): Promise { + installWithHapFilePathsInstallParamReturnsPromise(hapFilePaths: Array, installParam?: installer.InstallParam): Promise { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { @@ -102,7 +102,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { return p; } - install(hapFilePaths: Array, installParam: installer.InstallParam, callback: AsyncCallback): void { + installWithHapFilePathsInstallParamCallback(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); } @@ -115,7 +115,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); } - install(hapFilePaths: Array, callback: AsyncCallback): void { + installWithHapFilePathsCallback(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); } @@ -129,7 +129,13 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); } - uninstall(bundleName: string, installParam?: installer.InstallParam): Promise { + overload install { + installWithHapFilePathsInstallParamCallback, + installWithHapFilePathsCallback, + installWithHapFilePathsInstallParamReturnsPromise + } + + uninstallWithBundleNameInstallParamReturnsPromise(bundleName: string, installParam?: installer.InstallParam): Promise { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { @@ -144,7 +150,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { return p; } - uninstall(bundleName: string, installParam: installer.InstallParam, callback: AsyncCallback): void { + uninstallWithBundleNameInstallParamCallback(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); } @@ -157,7 +163,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); } - uninstall(bundleName: string, callback: AsyncCallback): void { + uninstallWithBundleNameCallback(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); } @@ -171,7 +177,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); } - recover(bundleName: string, installParam?: installer.InstallParam): Promise { + recoverWithBundleNameInstallParamReturnsPromise(bundleName: string, installParam?: installer.InstallParam): Promise { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { @@ -186,7 +192,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { return p; } - recover(bundleName: string, installParam: installer.InstallParam, callback: AsyncCallback): void { + recoverWithBundleNameInstallParamCallback(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); } @@ -199,7 +205,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); } - recover(bundleName: string, callback: AsyncCallback): void { + recoverWithBundleNameCallback(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); } @@ -212,7 +218,13 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); } - uninstall(uninstallParam: installer.UninstallParam): Promise { + overload recover { + recoverWithBundleNameInstallParamCallback, + recoverWithBundleNameCallback, + recoverWithBundleNameInstallParamReturnsPromise + } + + uninstallWithUninstallParamReturnsPromise(uninstallParam: installer.UninstallParam): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { let execFun = ():NullishType=>{ this.uninstallByOwnParamNative(uninstallParam); } let p1 = taskpool.execute(execFun); @@ -225,7 +237,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { return p; } - uninstall(uninstallParam: installer.UninstallParam, callback: AsyncCallback): void { + uninstallWithUninstallParamCallback(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 p1 = taskpool.execute(execFun); @@ -237,7 +249,15 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); } - updateBundleForSelf(hapFilePaths: Array, installParam?: installer.InstallParam): Promise { + overload uninstall { + uninstallWithBundleNameInstallParamCallback, + uninstallWithBundleNameCallback, + uninstallWithBundleNameInstallParamReturnsPromise, + uninstallWithUninstallParamCallback, + uninstallWithUninstallParamReturnsPromise + } + + updateBundleForSelfWithHapFilePathsInstallParamReturnsPromise(hapFilePaths: Array, installParam?: installer.InstallParam): Promise { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void):void => { @@ -252,7 +272,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { return p; } - updateBundleForSelf(hapFilePaths: Array, installParam: installer.InstallParam, callback: AsyncCallback): void { + updateBundleForSelfWithHapFilePathsInstallParamCallback(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 p1 = taskpool.execute(execFun); @@ -264,7 +284,7 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); } - updateBundleForSelf(hapFilePaths: Array, callback: AsyncCallback): void { + updateBundleForSelfWithHapFilePathsCallback(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); } @@ -278,6 +298,12 @@ export class BundleInstallerInner implements installer.BundleInstaller { }); } + overload updateBundleForSelf { + updateBundleForSelfWithHapFilePathsInstallParamCallback, + updateBundleForSelfWithHapFilePathsCallback, + updateBundleForSelfWithHapFilePathsInstallParamReturnsPromise + } + uninstallUpdates(bundleName: string, installParam?: installer.InstallParam): Promise { let emptyParam = new InstallParamInner(); let params = installParam ?? emptyParam; 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..46daec021222197e63563ff72ebdf611ab92f88a 100644 --- a/interfaces/kits/ani/bundle_manager/ets/@ohos.bundle.bundleManager.ets +++ b/interfaces/kits/ani/bundle_manager/ets/@ohos.bundle.bundleManager.ets @@ -344,26 +344,32 @@ namespace bundleManager { return bundleManager.setApplicationEnabledNative(bundleName, isEnabled, 0, true); } - function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: ExtensionAbilityType, + function queryExtensionAbilityInfoSyncWithWantExtensionAbilityTypeTypedExtensionAbilityTypeExtensionAbilityFlagsUserId(want: Want, extensionAbilityType: ExtensionAbilityType, extensionAbilityFlags: int, userId?: int): Array { let userIdInfo: int = userId ?? EMPTY_VALUE; return bundleManager.queryExtensionAbilityInfoNative( want, extensionAbilityType, "", extensionAbilityFlags, userIdInfo, false, true); } - function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: string, extensionAbilityFlags: int, + function queryExtensionAbilityInfoSyncWithWantStringTypedExtensionAbilityTypeExtensionAbilityFlagsUserId(want: Want, extensionAbilityType: string, extensionAbilityFlags: int, userId?: int): Array { let userIdInfo: int = userId ?? EMPTY_VALUE; return bundleManager.queryExtensionAbilityInfoNative( want, ExtensionAbilityType.UNSPECIFIED, extensionAbilityType, extensionAbilityFlags, userIdInfo, true, true); } - function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: int, + function queryExtensionAbilityInfoSyncWithStringTypedExtensionAbilityTypeExtensionAbilityFlagsUserId(extensionAbilityType: string, extensionAbilityFlags: int, userId?: int): Array { let userIdInfo: int = userId ?? EMPTY_VALUE; return bundleManager.queryExAbilityInfoSyncWithoutWantNative(extensionAbilityType, extensionAbilityFlags, userIdInfo); } + overload queryExtensionAbilityInfoSync { + queryExtensionAbilityInfoSyncWithWantExtensionAbilityTypeTypedExtensionAbilityTypeExtensionAbilityFlagsUserId, + queryExtensionAbilityInfoSyncWithWantStringTypedExtensionAbilityTypeExtensionAbilityFlagsUserId, + queryExtensionAbilityInfoSyncWithStringTypedExtensionAbilityTypeExtensionAbilityFlagsUserId + } + function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: int): BundleInfo { return bundleManager.getBundleArchiveInfoNative(hapFilePath, bundleFlags, true); } @@ -399,7 +405,7 @@ namespace bundleManager { return bundleManager.getDeveloperIdsNative(appDistributionTypeInfo); } - function getBundleInfoForSelf(bundleFlags: int, callback: AsyncCallback):void { + function getBundleInfoForSelfWithBundleFlagsCallback(bundleFlags: int, callback: AsyncCallback):void { let execFun = (): BundleInfo => { return bundleManager.getBundleInfoForSelfNative(bundleFlags, false); }; @@ -412,7 +418,7 @@ namespace bundleManager { }); } - function getBundleInfoForSelf(bundleFlags: int):Promise { + function getBundleInfoForSelfWithBundleFlagsReturnsPromise(bundleFlags: int):Promise { let p = new Promise((resolve: (bundleInfo: BundleInfo) => void, reject: (error: BusinessError) => void) => { let execFun = (): BundleInfo => { return bundleManager.getBundleInfoForSelfNative(bundleFlags, false); @@ -429,15 +435,25 @@ namespace bundleManager { return p; } - function getBundleInfoSync(bundleName: string, bundleFlags: int, userId: int): BundleInfo { + overload getBundleInfoForSelf { + getBundleInfoForSelfWithBundleFlagsReturnsPromise, + getBundleInfoForSelfWithBundleFlagsCallback + } + + function getBundleInfoSyncWithBundleNameBundleFlagsUserId(bundleName: string, bundleFlags: int, userId: int): BundleInfo { return bundleManager.getBundleInfoNative(bundleName, bundleFlags, userId, true); } - function getBundleInfoSync(bundleName: string, bundleFlags: int): BundleInfo { + function getBundleInfoSyncWithBundleNameBundleFlags(bundleName: string, bundleFlags: int): BundleInfo { return bundleManager.getBundleInfoNative(bundleName, bundleFlags, EMPTY_VALUE, true); } - function getBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise { + overload getBundleInfoSync { + getBundleInfoSyncWithBundleNameBundleFlagsUserId, + getBundleInfoSyncWithBundleNameBundleFlags + } + + function getBundleInfoWithBundleNameBundleFlagsUserIdReturnsPromise(bundleName: string, bundleFlags: int, userId?: int): Promise { let p = new Promise((resolve: (bundleInfo: BundleInfo) => void, reject: (error: BusinessError) => void) => { let userIdInfo: int = userId ?? EMPTY_VALUE; let execFun = (): BundleInfo => { @@ -455,7 +471,7 @@ namespace bundleManager { return p; } - function getBundleInfo(bundleName: string, bundleFlags: int, callback: AsyncCallback): void { + function getBundleInfoWithBundleNameBundleFlagsCallback(bundleName: string, bundleFlags: int, callback: AsyncCallback): void { let execFun = (): BundleInfo => { return bundleManager.getBundleInfoNative(bundleName, bundleFlags, EMPTY_VALUE, false); }; @@ -468,7 +484,7 @@ namespace bundleManager { }); } - function getBundleInfo(bundleName: string, bundleFlags: int, userId: int, callback: AsyncCallback): void { + function getBundleInfoWithBundleNameBundleFlagsUserIdCallback(bundleName: string, bundleFlags: int, userId: int, callback: AsyncCallback): void { let execFun = (): BundleInfo => { return bundleManager.getBundleInfoNative(bundleName, bundleFlags, userId, false); }; @@ -481,15 +497,26 @@ namespace bundleManager { }); } - function getApplicationInfoSync(bundleName: string, applicationFlags: int): ApplicationInfo { + overload getBundleInfo { + getBundleInfoWithBundleNameBundleFlagsCallback, + getBundleInfoWithBundleNameBundleFlagsUserIdCallback, + getBundleInfoWithBundleNameBundleFlagsUserIdReturnsPromise + } + + function getApplicationInfoSyncWithBundleNameApplicationFlags(bundleName: string, applicationFlags: int): ApplicationInfo { return bundleManager.getApplicationInfoNative(bundleName, applicationFlags, EMPTY_VALUE, true); } - function getApplicationInfoSync(bundleName: string, applicationFlags: int, userId: int): ApplicationInfo { + function getApplicationInfoSyncWithBundleNameApplicationFlagsUserId(bundleName: string, applicationFlags: int, userId: int): ApplicationInfo { return bundleManager.getApplicationInfoNative(bundleName, applicationFlags, userId, true); } - function getAllBundleInfo(bundleFlags: int, userId?: int): Promise> { + overload getApplicationInfoSync { + getApplicationInfoSyncWithBundleNameApplicationFlagsUserId, + getApplicationInfoSyncWithBundleNameApplicationFlags + } + + function getAllBundleInfoWithBundleFlagsUserIdReturnsPromise(bundleFlags: int, userId?: int): Promise> { let p = new Promise>((resolve: (bundleInfos: Array) => void, reject: (error: BusinessError) => void) => { let userIdInfo: int = userId ?? EMPTY_VALUE; @@ -508,7 +535,7 @@ namespace bundleManager { return p; } - function getAllBundleInfo(bundleFlags: int, callback: AsyncCallback>): void { + function getAllBundleInfoWithBundleFlagsCallback(bundleFlags: int, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.getAllBundleInfoNative(bundleFlags, EMPTY_VALUE); }; @@ -521,7 +548,7 @@ namespace bundleManager { }); } - function getAllBundleInfo(bundleFlags: int, userId: int, callback: AsyncCallback>): void { + function getAllBundleInfoWithBundleFlagsUserIdCallback(bundleFlags: int, userId: int, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.getAllBundleInfoNative(bundleFlags, userId); }; @@ -534,7 +561,13 @@ namespace bundleManager { }); } - function getAllApplicationInfo(appFlags: int, userId?: int): Promise> { + overload getAllBundleInfo { + getAllBundleInfoWithBundleFlagsCallback, + getAllBundleInfoWithBundleFlagsUserIdCallback, + getAllBundleInfoWithBundleFlagsUserIdReturnsPromise + } + + function getAllApplicationInfoWithAppFlagsUserIdReturnsPromise(appFlags: int, userId?: int): Promise> { let p = new Promise>((resolve: (applicationInfos: Array) => void, reject: (error: BusinessError) => void) => { let userIdInfo: int = userId ?? EMPTY_VALUE; @@ -553,7 +586,7 @@ namespace bundleManager { return p; } - function getAllApplicationInfo(appFlags: int, callback: AsyncCallback>): void { + function getAllApplicationInfoWithAppFlagsCallback(appFlags: int, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.getAllApplicationInfoNative(appFlags, EMPTY_VALUE); }; @@ -566,7 +599,7 @@ namespace bundleManager { }); } - function getAllApplicationInfo(appFlags: int, userId: int, + function getAllApplicationInfoWithAppFlagsUserIdCallback(appFlags: int, userId: int, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.getAllApplicationInfoNative(appFlags, userId); @@ -580,7 +613,13 @@ namespace bundleManager { }); } - function isApplicationEnabled(bundleName: string, appIndex: int): Promise { + overload getAllApplicationInfo { + getAllApplicationInfoWithAppFlagsCallback, + getAllApplicationInfoWithAppFlagsUserIdCallback, + getAllApplicationInfoWithAppFlagsUserIdReturnsPromise + } + + function isApplicationEnabledWithBundleNameAppIndexReturnsPromise(bundleName: string, appIndex: int): Promise { let p = new Promise((resolve: (isEnabled: boolean) => void, reject: (error: BusinessError) => void) => { let execFun = (): boolean => { return bundleManager.isApplicationEnabledNative(bundleName, appIndex, false); @@ -597,7 +636,7 @@ namespace bundleManager { return p; } - function isApplicationEnabled(bundleName: string): Promise { + function isApplicationEnabledWithBundleNameReturnsPromise(bundleName: string): Promise { let p = new Promise((resolve: (isEnabled: boolean) => void, reject: (error: BusinessError) => void) => { let execFun = (): boolean => { return bundleManager.isApplicationEnabledNative(bundleName, 0, false); @@ -614,7 +653,7 @@ namespace bundleManager { return p; } - function isApplicationEnabled(bundleName: string, callback: AsyncCallback): void { + function isApplicationEnabledWithBundleNameCallback(bundleName: string, callback: AsyncCallback): void { let execFun = (): boolean => { return bundleManager.isApplicationEnabledNative(bundleName, 0, false); }; @@ -627,7 +666,13 @@ namespace bundleManager { }); } - function queryAbilityInfo(want: Want, abilityFlags: int, userId?: int): Promise> { + overload isApplicationEnabled { + isApplicationEnabledWithBundleNameAppIndexReturnsPromise, + isApplicationEnabledWithBundleNameCallback, + isApplicationEnabledWithBundleNameReturnsPromise + } + + function queryAbilityInfoWithWantTypedWantAbilityFlagsUserIdReturnsPromise(want: Want, abilityFlags: int, userId?: int): Promise> { let p = new Promise>((resolve: (abilityInfos: Array) => void, reject: (error: BusinessError) => void) => { let userIdInfo: int = userId ?? EMPTY_VALUE; @@ -646,7 +691,7 @@ namespace bundleManager { return p; } - function queryAbilityInfo(want: Want, abilityFlags: int, callback: AsyncCallback>): void { + function queryAbilityInfoWithWantTypedWantAbilityFlagsCallback(want: Want, abilityFlags: int, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.queryAbilityInfoSyncNative(want, abilityFlags, EMPTY_VALUE, false); }; @@ -659,7 +704,7 @@ namespace bundleManager { }); } - function queryAbilityInfo(want: Want, + function queryAbilityInfoWithWantTypedWantAbilityFlagsUserIdCallback(want: Want, abilityFlags: int, userId: int, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.queryAbilityInfoSyncNative(want, abilityFlags, userId, false); @@ -673,7 +718,7 @@ namespace bundleManager { }); } - function getApplicationInfo(bundleName: string, appFlags: int, userId?: int): Promise { + function getApplicationInfoWithBundleNameAppFlagsUserIdReturnsPromise(bundleName: string, appFlags: int, userId?: int): Promise { let p = new Promise(( resolve: (applicationInfo: ApplicationInfo) => void, reject: (error: BusinessError) => void) => { let userIdInfo: int = userId ?? EMPTY_VALUE; @@ -692,7 +737,7 @@ namespace bundleManager { return p; } - function getApplicationInfo(bundleName: string, appFlags: int, callback: AsyncCallback): void { + function getApplicationInfoWithBundleNameAppFlagsCallback(bundleName: string, appFlags: int, callback: AsyncCallback): void { let execFun = (): ApplicationInfo => { return bundleManager.getApplicationInfoNative(bundleName, appFlags, EMPTY_VALUE, false); }; @@ -705,7 +750,7 @@ namespace bundleManager { }); } - function getApplicationInfo(bundleName: string, + function getApplicationInfoWithBundleNameAppFlagsUserIdCallback(bundleName: string, appFlags: int, userId: int, callback: AsyncCallback): void { let execFun = (): ApplicationInfo => { return bundleManager.getApplicationInfoNative(bundleName, appFlags, userId, false); @@ -719,6 +764,12 @@ namespace bundleManager { }); } + overload getApplicationInfo { + getApplicationInfoWithBundleNameAppFlagsCallback, + getApplicationInfoWithBundleNameAppFlagsUserIdCallback, + getApplicationInfoWithBundleNameAppFlagsUserIdReturnsPromise + } + function getAppCloneIdentity(uid: int): Promise { let p = new Promise(( resolve: (appCloneIdentity: AppCloneIdentity) => void, reject: (error: BusinessError) => void) => { @@ -737,7 +788,7 @@ namespace bundleManager { return p; } - function getAbilityLabel(bundleName: string, moduleName: string, abilityName: string): Promise { + function getAbilityLabelWithBundleNameModuleNameAbilityNameReturnsPromise(bundleName: string, moduleName: string, abilityName: string): Promise { let p = new Promise(( resolve: (label: string) => void, reject: (error: BusinessError) => void) => { let execFun = (): string => { @@ -755,7 +806,7 @@ namespace bundleManager { return p; } - function getAbilityLabel( + function getAbilityLabelWithBundleNameModuleNameAbilityNameCallback( bundleName: string, moduleName: string, abilityName: string, callback: AsyncCallback): void { let execFun = (): string => { return bundleManager.getAbilityLabelNative(bundleName, moduleName, abilityName, false); @@ -769,7 +820,12 @@ namespace bundleManager { }); } - function getLaunchWantForBundle(bundleName: string, userId?: int): Promise { + overload getAbilityLabel { + getAbilityLabelWithBundleNameModuleNameAbilityNameCallback, + getAbilityLabelWithBundleNameModuleNameAbilityNameReturnsPromise + } + + function getLaunchWantForBundleWithBundleNameUserIdReturnsPromise(bundleName: string, userId?: int): Promise { let p = new Promise(( resolve: (want: Want) => void, reject: (error: BusinessError) => void) => { let userIdInfo: int = userId ?? EMPTY_VALUE; @@ -788,7 +844,7 @@ namespace bundleManager { return p; } - function getLaunchWantForBundle(bundleName: string, userId: int, callback: AsyncCallback): void { + function getLaunchWantForBundleWithBundleNameUserIdCallback(bundleName: string, userId: int, callback: AsyncCallback): void { let execFun = (): Want => { return bundleManager.getLaunchWantForBundleNative(bundleName, userId, false); }; @@ -801,7 +857,7 @@ namespace bundleManager { }); } - function getLaunchWantForBundle(bundleName: string, callback: AsyncCallback): void { + function getLaunchWantForBundleWithBundleNameCallback(bundleName: string, callback: AsyncCallback): void { let execFun = (): Want => { return bundleManager.getLaunchWantForBundleNative(bundleName, EMPTY_VALUE, false); }; @@ -814,6 +870,12 @@ namespace bundleManager { }); } + overload getLaunchWantForBundle { + getLaunchWantForBundleWithBundleNameUserIdCallback, + getLaunchWantForBundleWithBundleNameCallback, + getLaunchWantForBundleWithBundleNameUserIdReturnsPromise + } + function getAppCloneBundleInfo(bundleName: string, appIndex: int, bundleFlags: int, userId?: int): Promise { let p = new Promise((resolve: (bundleInfo: BundleInfo) => void, @@ -834,7 +896,7 @@ namespace bundleManager { return p; } - function getBundleNameByUid(uid: int, callback: AsyncCallback): void { + function getBundleNameByUidWithUidCallback(uid: int, callback: AsyncCallback): void { let execFun = (): string => { return bundleManager.getBundleNameByUidNative(uid, false); }; @@ -847,7 +909,7 @@ namespace bundleManager { }); } - function getBundleNameByUid(uid: int): Promise { + function getBundleNameByUidWithUidReturnsPromise(uid: int): Promise { let p = new Promise((resolve: (result: string) => void, reject: (error: BusinessError) => void) => { let execFun = (): string => { return bundleManager.getBundleNameByUidNative(uid, false); @@ -864,7 +926,12 @@ namespace bundleManager { return p; } - function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, + overload getBundleNameByUid { + getBundleNameByUidWithUidCallback, + getBundleNameByUidWithUidReturnsPromise + } + + function queryExtensionAbilityInfoWithWantExtensionAbilityTypeExtensionAbilityFlagsCallback(want: Want, extensionAbilityType: ExtensionAbilityType, extensionAbilityFlags: int, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.queryExtensionAbilityInfoNative( @@ -879,7 +946,7 @@ namespace bundleManager { }); } - function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, + function queryExtensionAbilityInfoWithWantExtensionAbilityTypeExtensionAbilityFlagsUserIdCallback(want: Want, extensionAbilityType: ExtensionAbilityType, extensionAbilityFlags: int, userId: int, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.queryExtensionAbilityInfoNative( @@ -894,7 +961,7 @@ namespace bundleManager { }); } - function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, + function queryExtensionAbilityInfoWithWantExtensionAbilityTypeExtensionAbilityFlagsUserIdReturnsPromise(want: Want, extensionAbilityType: ExtensionAbilityType, extensionAbilityFlags: int, userId?: int): Promise> { let p = new Promise>(( resolve: (extensionAbilityInfos: Array) => void, @@ -916,7 +983,13 @@ namespace bundleManager { return p; } - function isAbilityEnabled(info: AbilityInfo, appIndex: int): Promise { + overload queryExtensionAbilityInfo { + queryExtensionAbilityInfoWithWantExtensionAbilityTypeExtensionAbilityFlagsCallback, + queryExtensionAbilityInfoWithWantExtensionAbilityTypeExtensionAbilityFlagsUserIdCallback, + queryExtensionAbilityInfoWithWantExtensionAbilityTypeExtensionAbilityFlagsUserIdReturnsPromise + } + + function isAbilityEnabledWithInfoAppIndexReturnsPromise(info: AbilityInfo, appIndex: int): Promise { let p = new Promise((resolve: (isEnabled: boolean) => void, reject: (error: BusinessError) => void) => { let execFun = (): boolean => { return bundleManager.isAbilityEnabledNative(info, appIndex, false); @@ -933,7 +1006,7 @@ namespace bundleManager { return p; } - function isAbilityEnabled(info: AbilityInfo): Promise { + function isAbilityEnabledWithInfoReturnsPromise(info: AbilityInfo): Promise { let p = new Promise((resolve: (isEnabled: boolean) => void, reject: (error: BusinessError) => void) => { let execFun = (): boolean => { return bundleManager.isAbilityEnabledNative(info, 0, false); @@ -950,7 +1023,7 @@ namespace bundleManager { return p; } - function isAbilityEnabled(info: AbilityInfo, callback: AsyncCallback): void { + function isAbilityEnabledWithInfoAppIndexCallback(info: AbilityInfo, callback: AsyncCallback): void { let execFun = (): boolean => { return bundleManager.isAbilityEnabledNative(info, 0, false); }; @@ -963,7 +1036,13 @@ namespace bundleManager { }); } - function setAbilityEnabled(info: AbilityInfo, appIndex: int, isEnabled: boolean): Promise { + overload isAbilityEnabled { + isAbilityEnabledWithInfoAppIndexReturnsPromise, + isAbilityEnabledWithInfoAppIndexCallback, + isAbilityEnabledWithInfoReturnsPromise + } + + function setAbilityEnabledWithInfoAppIndexIsEnabledReturnsPromise(info: AbilityInfo, appIndex: int, isEnabled: boolean): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let execFun = (): void => { return bundleManager.setAbilityEnabledNative(info, isEnabled, appIndex, false); @@ -979,7 +1058,7 @@ namespace bundleManager { return p; } - function setAbilityEnabled(info: AbilityInfo, isEnabled: boolean): Promise { + function setAbilityEnabledWithInfoIsEnabledReturnsPromise(info: AbilityInfo, isEnabled: boolean): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let execFun = (): void => { return bundleManager.setAbilityEnabledNative(info, isEnabled, 0, false); @@ -995,7 +1074,7 @@ namespace bundleManager { return p; } - function setAbilityEnabled(info: AbilityInfo, isEnabled: boolean, callback: AsyncCallback): void { + function setAbilityEnabledWithInfoIsEnabledCallback(info: AbilityInfo, isEnabled: boolean, callback: AsyncCallback): void { let execFun = (): void => { return bundleManager.setAbilityEnabledNative(info, isEnabled, 0, false); }; @@ -1007,7 +1086,13 @@ namespace bundleManager { }); } - function setApplicationEnabled(bundleName: string, appIndex: int, isEnabled: boolean): Promise { + overload setAbilityEnabled { + setAbilityEnabledWithInfoAppIndexIsEnabledReturnsPromise, + setAbilityEnabledWithInfoIsEnabledCallback, + setAbilityEnabledWithInfoIsEnabledReturnsPromise + } + + function setApplicationEnabledWithBundleNameAppIndexIsEnabledReturnsPromise(bundleName: string, appIndex: int, isEnabled: boolean): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let execFun = (): void => { return bundleManager.setApplicationEnabledNative(bundleName, isEnabled, appIndex, false); @@ -1023,7 +1108,7 @@ namespace bundleManager { return p; } - function setApplicationEnabled(bundleName: string, isEnabled: boolean): Promise { + function setApplicationEnabledWithBundleNameIsEnabledReturnsPromise(bundleName: string, isEnabled: boolean): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let execFun = (): void => { return bundleManager.setApplicationEnabledNative(bundleName, isEnabled, 0, false); @@ -1039,7 +1124,7 @@ namespace bundleManager { return p; } - function setApplicationEnabled(bundleName: string, isEnabled: boolean, callback: AsyncCallback): void { + function setApplicationEnabledWithBundleNameIsEnabledCallback(bundleName: string, isEnabled: boolean, callback: AsyncCallback): void { let execFun = (): void => { return bundleManager.setApplicationEnabledNative(bundleName, isEnabled, 0, false); }; @@ -1051,6 +1136,12 @@ namespace bundleManager { }); } + overload setApplicationEnabled { + setApplicationEnabledWithBundleNameAppIndexIsEnabledReturnsPromise, + setApplicationEnabledWithBundleNameIsEnabledCallback, + setApplicationEnabledWithBundleNameIsEnabledReturnsPromise + } + function getDynamicIcon(bundleName: string): Promise { let p = new Promise(( resolve: (icon: string) => void, reject: (error: BusinessError) => void) => { @@ -1069,7 +1160,7 @@ namespace bundleManager { return p; } - function queryAbilityInfo(wants: Array, abilityFlags: int, userId?: int): Promise> { + function queryAbilityInfoWithArrayOfWantTypedWantAbilityFlagsUserIdReturnsPromise(wants: Array, abilityFlags: int, userId?: int): Promise> { let p = new Promise>((resolve: (abilityInfos: Array) => void, reject: (error: BusinessError) => void) => { let userIdInfo: int = userId ?? EMPTY_VALUE; @@ -1088,7 +1179,14 @@ namespace bundleManager { return p; } - function enableDynamicIcon(bundleName: string, moduleName: string): Promise { + overload queryAbilityInfo { + queryAbilityInfoWithWantTypedWantAbilityFlagsCallback, + queryAbilityInfoWithWantTypedWantAbilityFlagsUserIdCallback, + queryAbilityInfoWithWantTypedWantAbilityFlagsUserIdReturnsPromise, + queryAbilityInfoWithArrayOfWantTypedWantAbilityFlagsUserIdReturnsPromise + } + + function enableDynamicIconWithBundleNameModuleNameReturnsPromise(bundleName: string, moduleName: string): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let bundleOptions = new BundleOptionsInner(); let execFun = (): void => { @@ -1105,7 +1203,7 @@ namespace bundleManager { return p; } - function enableDynamicIcon(bundleName: string, moduleName: string, option?: BundleOptions): Promise { + function enableDynamicIconWithBundleNameModuleNameOptionReturnsPromise(bundleName: string, moduleName: string, option?: BundleOptions): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let bundleOptions = option ?? new BundleOptionsInner(); let execFun = (): void => { @@ -1122,7 +1220,12 @@ namespace bundleManager { return p; } - function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int, callback: AsyncCallback): void { + overload enableDynamicIcon { + enableDynamicIconWithBundleNameModuleNameReturnsPromise, + enableDynamicIconWithBundleNameModuleNameOptionReturnsPromise + } + + function getBundleArchiveInfoWithHapFilePathBundleFlagsCallback(hapFilePath: string, bundleFlags: int, callback: AsyncCallback): void { let execFun = (): BundleInfo => { return bundleManager.getBundleArchiveInfoNative(hapFilePath, bundleFlags, false); }; @@ -1135,7 +1238,7 @@ namespace bundleManager { }); } - function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int): Promise { + function getBundleArchiveInfoWithHapFilePathBundleFlagsReturnsPromise(hapFilePath: string, bundleFlags: int): Promise { let p = new Promise((resolve: (bundleInfo: BundleInfo) => void, reject: (error: Error) => void) => { let execFun = (): BundleInfo => { @@ -1153,7 +1256,12 @@ namespace bundleManager { return p; } - function getProfileByAbility(moduleName: string, abilityName: string, metadataName?: string): Promise> { + overload getBundleArchiveInfo { + getBundleArchiveInfoWithHapFilePathBundleFlagsCallback, + getBundleArchiveInfoWithHapFilePathBundleFlagsReturnsPromise + } + + function getProfileByAbilityWithModuleNameAbilityNameMetadataNameReturnsPromise(moduleName: string, abilityName: string, metadataName?: string): Promise> { let p = new Promise>((resolve: (profile: Array) => void, reject: (error: Error) => void) => { let metadataNameInfo: string = metadataName ?? ""; @@ -1172,7 +1280,7 @@ namespace bundleManager { return p; } - function getProfileByAbility(moduleName: string, + function getProfileByAbilityWithModuleNameAbilityNameMetadataNameCallback(moduleName: string, abilityName: string, metadataName: string, callback: AsyncCallback>) { let execFun = (): Array => { return bundleManager.getProfileByAbilityNative(moduleName, abilityName, metadataName, AbilityProfileType.ABILITY_PROFILE, false); @@ -1186,7 +1294,12 @@ namespace bundleManager { }); } - function getProfileByExtensionAbility(moduleName: string, + overload getProfileByAbility { + getProfileByAbilityWithModuleNameAbilityNameMetadataNameCallback, + getProfileByAbilityWithModuleNameAbilityNameMetadataNameReturnsPromise + } + + function getProfileByExtensionAbilityWithModuleNameExtensionAbilityNameMetadataNameReturnsPromise(moduleName: string, extensionAbilityName: string, metadataName?: string): Promise> { let p = new Promise>((resolve: (profile: Array) => void, reject: (error: Error) => void) => { @@ -1206,7 +1319,7 @@ namespace bundleManager { return p; } - function getProfileByExtensionAbility(moduleName: string, + function getProfileByExtensionAbilityWithModuleNameExtensionAbilityNameMetadataNameCallback(moduleName: string, extensionAbilityName: string, metadataName: string, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.getProfileByAbilityNative(moduleName, extensionAbilityName, metadataName, AbilityProfileType.EXTENSION_PROFILE, false); @@ -1220,7 +1333,12 @@ namespace bundleManager { }); } - function getPermissionDef(permissionName: string): Promise { + overload getProfileByExtensionAbility { + getProfileByExtensionAbilityWithModuleNameExtensionAbilityNameMetadataNameCallback, + getProfileByExtensionAbilityWithModuleNameExtensionAbilityNameMetadataNameReturnsPromise + } + + function getPermissionDefWithPermissionNameReturnsPromise(permissionName: string): Promise { let p = new Promise((resolve: (profile: PermissionDef) => void, reject: (error: Error) => void) => { let execFun = (): PermissionDef => { @@ -1238,7 +1356,7 @@ namespace bundleManager { return p; } - function getPermissionDef(permissionName: string, callback: AsyncCallback): void { + function getPermissionDefWithPermissionNameCallback(permissionName: string, callback: AsyncCallback): void { let execFun = (): PermissionDef => { return bundleManager.getPermissionDefNative(permissionName, false); }; @@ -1251,7 +1369,12 @@ namespace bundleManager { }); } - function cleanBundleCacheFiles(bundleName: string, callback: AsyncCallback): void { + overload getPermissionDef { + getPermissionDefWithPermissionNameCallback, + getPermissionDefWithPermissionNameReturnsPromise + } + + function cleanBundleCacheFilesWithBundleNameCallback(bundleName: string, callback: AsyncCallback): void { let execFun = (): void => { return bundleManager.cleanBundleCacheFilesNative(bundleName, 0); }; @@ -1263,7 +1386,7 @@ namespace bundleManager { }); } - function cleanBundleCacheFiles(bundleName: string): Promise { + function cleanBundleCacheFilesWithBundleNameReturnsPromise(bundleName: string): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: Error) => void) : void => { let execFun = (): void => { return bundleManager.cleanBundleCacheFilesNative(bundleName, 0); @@ -1279,7 +1402,7 @@ namespace bundleManager { return p; } - function cleanBundleCacheFiles(bundleName: string, appIndex: int): Promise { + function cleanBundleCacheFilesWithBundleNameAppIndexReturnsPromise(bundleName: string, appIndex: int): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: Error) => void) : void => { let execFun = (): void => { return bundleManager.cleanBundleCacheFilesNative(bundleName, appIndex); @@ -1295,6 +1418,12 @@ namespace bundleManager { return p; } + overload cleanBundleCacheFiles { + cleanBundleCacheFilesWithBundleNameCallback, + cleanBundleCacheFilesWithBundleNameReturnsPromise, + cleanBundleCacheFilesWithBundleNameAppIndexReturnsPromise + } + function getAllBundleCacheSize(): Promise { let p = new Promise((resolve: (size: long) => void, reject: (error: Error) => void) => { let execFun = (): long => { @@ -1328,7 +1457,7 @@ namespace bundleManager { return p; } - function getAppProvisionInfo(bundleName: string, userId?: int): Promise { + function getAppProvisionInfoWithBundleNameUserIdReturnsPromise(bundleName: string, userId?: int): Promise { let p = new Promise((resolve: (appProvisionInfo: AppProvisionInfo) => void, reject: (error: Error) => void) => { let userIdInfo: int = userId ?? EMPTY_VALUE; @@ -1347,7 +1476,7 @@ namespace bundleManager { return p; } - function getAppProvisionInfo(bundleName: string, userId: int, callback: AsyncCallback): void { + function getAppProvisionInfoWithBundleNameUserIdCallback(bundleName: string, userId: int, callback: AsyncCallback): void { let execFun = (): AppProvisionInfo => { return bundleManager.getAppProvisionInfoNative(bundleName, userId, false); }; @@ -1360,7 +1489,7 @@ namespace bundleManager { }); } - function getAppProvisionInfo(bundleName: string, callback: AsyncCallback): void { + function getAppProvisionInfoWithBundleNameCallback(bundleName: string, callback: AsyncCallback): void { let execFun = (): AppProvisionInfo => { return bundleManager.getAppProvisionInfoNative(bundleName, EMPTY_VALUE, false); }; @@ -1373,6 +1502,12 @@ namespace bundleManager { }); } + overload getAppProvisionInfo { + getAppProvisionInfoWithBundleNameCallback, + getAppProvisionInfoWithBundleNameUserIdCallback, + getAppProvisionInfoWithBundleNameUserIdReturnsPromise + } + function getAllPreinstalledApplicationInfo(): Promise> { let p = new Promise>((resolve: (applicationInfo: Array) => void, reject: (error: Error) => void) => { @@ -1411,7 +1546,7 @@ namespace bundleManager { return p; } - function getAllSharedBundleInfo(): Promise> { + function getAllSharedBundleInfoReturnsPromise(): Promise> { let p = new Promise>((resolve: (sharedBundleInfos: Array) => void, reject: (error: BusinessError) => void) => { let execFun = (): Array => { @@ -1429,7 +1564,7 @@ namespace bundleManager { return p; } - function getAllSharedBundleInfo(callback: AsyncCallback>): void { + function getAllSharedBundleInfoWithCallback(callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.getAllSharedBundleInfoNative(); }; @@ -1442,7 +1577,12 @@ namespace bundleManager { }); } - function getSharedBundleInfo(bundleName: string, moduleName: string): Promise> { + overload getAllSharedBundleInfo { + getAllSharedBundleInfoWithCallback, + getAllSharedBundleInfoReturnsPromise + } + + function getSharedBundleInfoWithBundleNameModuleNameReturnsPromise(bundleName: string, moduleName: string): Promise> { let p = new Promise>((resolve: (sharedBundleInfos: Array) => void, reject: (error: BusinessError) => void) => { let execFun = (): Array => { @@ -1460,7 +1600,7 @@ namespace bundleManager { return p; } - function getSharedBundleInfo(bundleName: string, moduleName: string, + function getSharedBundleInfoWithBundleNameModuleNameCallback(bundleName: string, moduleName: string, callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.getSharedBundleInfoNative(bundleName, moduleName); @@ -1474,6 +1614,11 @@ namespace bundleManager { }); } + overload getSharedBundleInfo { + getSharedBundleInfoWithBundleNameModuleNameCallback, + getSharedBundleInfoWithBundleNameModuleNameReturnsPromise + } + function getExtResource(bundleName: string): Promise> { let p = new Promise>((resolve: (extResource: Array) => void, reject: (error: BusinessError) => void) => { @@ -1492,7 +1637,7 @@ namespace bundleManager { return p; } - function disableDynamicIcon(bundleName: string): Promise { + function disableDynamicIconWithBundleNameReturnsPromise(bundleName: string): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let bundleOptions = new BundleOptionsInner(); let execFun = (): void => { @@ -1509,7 +1654,7 @@ namespace bundleManager { return p; } - function disableDynamicIcon(bundleName: string, option?: BundleOptions): Promise { + function disableDynamicIconWithBundleNameOptionReturnsPromise(bundleName: string, option?: BundleOptions): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let bundleOptions = option ?? new BundleOptionsInner(); let execFun = (): void => { @@ -1526,6 +1671,11 @@ namespace bundleManager { return p; } + overload disableDynamicIcon { + disableDynamicIconWithBundleNameReturnsPromise, + disableDynamicIconWithBundleNameOptionReturnsPromise + } + function getDynamicIconInfo(bundleName: string): Promise> { let p = new Promise>((resolve: (dynamicIconInfos: Array) => void, reject: (error: BusinessError) => void) => { @@ -1563,7 +1713,7 @@ namespace bundleManager { return p; } - function verifyAbc(abcPaths: Array, deleteOriginalFiles: boolean): Promise { + function verifyAbcWithAbcPathsDeleteOriginalFilesReturnsPromise(abcPaths: Array, deleteOriginalFiles: boolean): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let execFun = (): void => { return bundleManager.verifyAbcNative(abcPaths, deleteOriginalFiles); @@ -1579,7 +1729,7 @@ namespace bundleManager { return p; } - function verifyAbc(abcPaths: Array, deleteOriginalFiles: boolean, callback: AsyncCallback): void { + function verifyAbcWithAbcPathsDeleteOriginalFilesCallback(abcPaths: Array, deleteOriginalFiles: boolean, callback: AsyncCallback): void { let execFun = (): void => { return bundleManager.verifyAbcNative(abcPaths, deleteOriginalFiles); }; @@ -1591,7 +1741,12 @@ namespace bundleManager { }); } - function getRecoverableApplicationInfo(): Promise> { + overload verifyAbc { + verifyAbcWithAbcPathsDeleteOriginalFilesCallback, + verifyAbcWithAbcPathsDeleteOriginalFilesReturnsPromise + } + + function getRecoverableApplicationInfoReturnsPromise(): Promise> { let p = new Promise>((resolve: (applicationInfo: Array) => void, reject: (error: BusinessError) => void) => { let execFun = (): Array => { @@ -1609,7 +1764,7 @@ namespace bundleManager { return p; } - function getRecoverableApplicationInfo(callback: AsyncCallback>): void { + function getRecoverableApplicationInfoWithCallback(callback: AsyncCallback>): void { let execFun = (): Array => { return bundleManager.getRecoverableApplicationInfoNative(); }; @@ -1622,6 +1777,11 @@ namespace bundleManager { }); } + overload getRecoverableApplicationInfo { + getRecoverableApplicationInfoWithCallback, + getRecoverableApplicationInfoReturnsPromise + } + function deleteAbc(abcPath: string): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void) : void => { let execFun = (): 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..7d86f0cf37dfbc3297246737a3e33f023c4de6f9 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 @@ -45,7 +45,7 @@ export default namespace defaultAppManager { export native function setDefaultApplicationNative(type: string, elementName: ElementName, userId: int, isSync: boolean): void; export native function resetDefaultApplicationNative(type: string, userId: int, isSync: boolean): void; - function isDefaultApplication(type: string, callback: AsyncCallback): void { + function isDefaultApplicationWithTypeCallback(type: string, callback: AsyncCallback): void { let cb = (): boolean => { return defaultAppManager.isDefaultApplicationNative(type, false); }; @@ -59,7 +59,7 @@ export default namespace defaultAppManager { } - function isDefaultApplication(type: string): Promise { + function isDefaultApplicationWithTypeReturnsPromise(type: string): Promise { let p = new Promise((resolve: (isDefaultApp: boolean) => void, reject: (error: Error) => void) => { let cb = (): boolean => { return defaultAppManager.isDefaultApplicationNative(type, false); @@ -76,11 +76,16 @@ export default namespace defaultAppManager { return p; } + overload isDefaultApplication { + isDefaultApplicationWithTypeCallback, + isDefaultApplicationWithTypeReturnsPromise + } + function isDefaultApplicationSync(type: string): boolean { return defaultAppManager.isDefaultApplicationNative(type, true); } - function getDefaultApplication(type: string, userId: int, callback: AsyncCallback): void { + function getDefaultApplicationWithTypeUserIdCallback(type: string, userId: int, callback: AsyncCallback): void { let cb = (): BundleInfo => { return defaultAppManager.getDefaultApplicationNative(type, userId, false); }; @@ -93,7 +98,7 @@ export default namespace defaultAppManager { }); } - function getDefaultApplication(type: string, callback: AsyncCallback): void { + function getDefaultApplicationWithTypeCallback(type: string, callback: AsyncCallback): void { let cb = (): BundleInfo => { return defaultAppManager.getDefaultApplicationNative(type, EMPTY_USER_ID, false); }; @@ -106,7 +111,7 @@ export default namespace defaultAppManager { }); } - function getDefaultApplication(type: string, userId?: int): Promise { + function getDefaultApplicationWithTypeUserIdReturnsPromise(type: string, userId?: int): Promise { let userIdInfo: int = userId ?? EMPTY_USER_ID; let p = new Promise((resolve: (bundleInfo: BundleInfo) => void, reject: (error: Error) => void) => { let cb = (): BundleInfo => { @@ -123,12 +128,18 @@ export default namespace defaultAppManager { return p; } + overload getDefaultApplication { + getDefaultApplicationWithTypeUserIdCallback, + getDefaultApplicationWithTypeCallback, + getDefaultApplicationWithTypeUserIdReturnsPromise + } + function getDefaultApplicationSync(type: string, userId?: int): BundleInfo { let userIdInfo: int = userId ?? EMPTY_USER_ID; return defaultAppManager.getDefaultApplicationNative(type, userIdInfo, true); } - function setDefaultApplication(type: string, elementName: ElementName, userId: int, callback: AsyncCallback): void { + function setDefaultApplicationWithTypeElementNameUserIdCallback(type: string, elementName: ElementName, userId: int, callback: AsyncCallback): void { let cb = (): void => { return defaultAppManager.setDefaultApplicationNative(type, elementName, userId, false); }; @@ -140,7 +151,7 @@ export default namespace defaultAppManager { }); } - function setDefaultApplication(type: string, elementName: ElementName, callback: AsyncCallback): void { + function setDefaultApplicationWithTypeElementNameCallback(type: string, elementName: ElementName, callback: AsyncCallback): void { let cb = (): void => { return defaultAppManager.setDefaultApplicationNative(type, elementName, EMPTY_USER_ID, false); }; @@ -152,7 +163,7 @@ export default namespace defaultAppManager { }); } - function setDefaultApplication(type: string, elementName: ElementName, userId?: int): Promise { + function setDefaultApplicationWithTypeElementNameUserIdReturnsPromise(type: string, elementName: ElementName, userId?: int): Promise { let userIdInfo: int = userId ?? EMPTY_USER_ID; let p = new Promise((resolve: (v: undefined) => void, reject: (error: Error) => void) : void => { let cb = (): void => { @@ -169,12 +180,18 @@ export default namespace defaultAppManager { return p; } + overload setDefaultApplication { + setDefaultApplicationWithTypeElementNameUserIdCallback, + setDefaultApplicationWithTypeElementNameCallback, + setDefaultApplicationWithTypeElementNameUserIdReturnsPromise + } + function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: int): void { let userIdInfo: int = userId ?? EMPTY_USER_ID; return defaultAppManager.setDefaultApplicationNative(type, elementName, userIdInfo, true); } - function resetDefaultApplication(type: string, userId: int, callback: AsyncCallback): void { + function resetDefaultApplicationWithTypeUserIdCallback(type: string, userId: int, callback: AsyncCallback): void { let cb = (): void => { return defaultAppManager.resetDefaultApplicationNative(type, userId, false); }; @@ -186,7 +203,7 @@ export default namespace defaultAppManager { }); } - function resetDefaultApplication(type: string, callback: AsyncCallback): void { + function resetDefaultApplicationWithTypeCallback(type: string, callback: AsyncCallback): void { let cb = (): void => { return defaultAppManager.resetDefaultApplicationNative(type, EMPTY_USER_ID, false); }; @@ -198,7 +215,7 @@ export default namespace defaultAppManager { }); } - function resetDefaultApplication(type: string, userId?: int): Promise { + function resetDefaultApplicationWithTypeUserIdReturnsPromise(type: string, userId?: int): Promise { let userIdInfo: int = userId ?? EMPTY_USER_ID; let p = new Promise((resolve: (v: undefined) => void, reject: (error: Error) => void) : void => { let cb = (): void => { @@ -215,6 +232,12 @@ export default namespace defaultAppManager { return p; } + overload resetDefaultApplication { + resetDefaultApplicationWithTypeUserIdCallback, + resetDefaultApplicationWithTypeCallback, + resetDefaultApplicationWithTypeUserIdReturnsPromise + } + function resetDefaultApplicationSync(type: string, userId?: int): void { let userIdInfo: int = userId ?? EMPTY_USER_ID; return defaultAppManager.resetDefaultApplicationNative(type, userIdInfo, true); diff --git a/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets b/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets index 7f939253c9425393da826a99d89e921164970d5e..33b217852b8ccad962f1329e2651539d9d324f40 100644 --- a/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets +++ b/interfaces/kits/ani/freeInstall/ets/@ohos.bundle.freeInstall.ets @@ -42,7 +42,7 @@ namespace freeInstall { export native function getBundlePackInfoNative(bundleName: string, bundlePackFlag: BundlePackFlag): BundlePackInfo; export native function getDispatchInfoNative(): DispatchInfo; - function setHapModuleUpgradeFlag(bundleName: string, moduleName: string, upgradeFlag: UpgradeFlag, callback: AsyncCallback): void { + function setHapModuleUpgradeFlagWithBundleNameModuleNameUpgradeFlagCallback(bundleName: string, moduleName: string, upgradeFlag: UpgradeFlag, callback: AsyncCallback): void { let execFun = (): void => { freeInstall.setHapModuleUpgradeFlagNative(bundleName, moduleName, upgradeFlag); }; @@ -54,7 +54,7 @@ namespace freeInstall { }); } - function setHapModuleUpgradeFlag(bundleName: string, moduleName: string, upgradeFlag: UpgradeFlag): Promise { + function setHapModuleUpgradeFlagBundleNameModuleNameUpgradeFlagReturnsPromise(bundleName: string, moduleName: string, upgradeFlag: UpgradeFlag): Promise { let p: Promise = new Promise((resolve: (v:PromiseLike) => void, reject: (error: Error) => void) : void => { let execFun = (): void => { freeInstall.setHapModuleUpgradeFlagNative(bundleName, moduleName, upgradeFlag); @@ -69,7 +69,12 @@ namespace freeInstall { return p; } - function isHapModuleRemovable(bundleName: string, moduleName: string, callback: AsyncCallback): void { + overload setHapModuleUpgradeFlag { + setHapModuleUpgradeFlagWithBundleNameModuleNameUpgradeFlagCallback, + setHapModuleUpgradeFlagBundleNameModuleNameUpgradeFlagReturnsPromise + } + + function isHapModuleRemovableWithBundleNameModuleNameCallback(bundleName: string, moduleName: string, callback: AsyncCallback): void { let execFun = (): boolean => { return freeInstall.isHapModuleRemovableNative(bundleName, moduleName); }; @@ -82,7 +87,7 @@ namespace freeInstall { }); } - function isHapModuleRemovable(bundleName: string, moduleName: string): Promise { + function isHapModuleRemovableWithBundleNameModuleNameReturnsPromise(bundleName: string, moduleName: string): Promise { let p = new Promise((resolve: (result: boolean) => void, reject: (error: BusinessError) => void) => { let execFun = (): boolean => { return freeInstall.isHapModuleRemovableNative(bundleName, moduleName); @@ -98,7 +103,12 @@ namespace freeInstall { return p; } - function getBundlePackInfo(bundleName: string, bundlePackFlag: BundlePackFlag, callback: AsyncCallback): void { + overload isHapModuleRemovable { + isHapModuleRemovableWithBundleNameModuleNameCallback, + isHapModuleRemovableWithBundleNameModuleNameReturnsPromise + } + + function getBundlePackInfoWithBundleNameBundlePackFlagCallback(bundleName: string, bundlePackFlag: BundlePackFlag, callback: AsyncCallback): void { let execFun = (): BundlePackInfo => { return freeInstall.getBundlePackInfoNative(bundleName, bundlePackFlag); }; @@ -111,7 +121,7 @@ namespace freeInstall { }); } - function getBundlePackInfo(bundleName: string, bundlePackFlag: BundlePackFlag): Promise { + function getBundlePackInfoWithBundleNameBundlePackFlagReturnsPromise(bundleName: string, bundlePackFlag: BundlePackFlag): Promise { let p = new Promise((resolve: (result: BundlePackInfo) => void, reject: (error: BusinessError) => void) => { let execFun = (): BundlePackInfo => { return freeInstall.getBundlePackInfoNative(bundleName, bundlePackFlag); @@ -127,7 +137,12 @@ namespace freeInstall { return p; } - function getDispatchInfo(callback: AsyncCallback): void { + overload getBundlePackInfo { + getBundlePackInfoWithBundleNameBundlePackFlagCallback, + getBundlePackInfoWithBundleNameBundlePackFlagReturnsPromise + } + + function getDispatchInfoWithCallback(callback: AsyncCallback): void { let execFun = (): DispatchInfo => { return freeInstall.getDispatchInfoNative(); }; @@ -140,7 +155,7 @@ namespace freeInstall { }); } - function getDispatchInfo(): Promise { + function getDispatchInfoReturnsPromise(): Promise { let p = new Promise((resolve: (result: DispatchInfo) => void, reject: (error: BusinessError) => void) => { let execFun = (): DispatchInfo => { return freeInstall.getDispatchInfoNative(); @@ -156,6 +171,11 @@ namespace freeInstall { return p; } + overload getDispatchInfo { + getDispatchInfoWithCallback, + getDispatchInfoReturnsPromise + } + export type DispatchInfo = _DispatchInfo; export type BundlePackInfo = _BundlePackInfo; export type PackageConfig = _PackageConfig; 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..109b2aaa47c1d9eb7ef33d23ef88c0a7bebfbaa0 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 @@ -49,15 +49,20 @@ export default namespace launcherBundleManager { return p; } - function getShortcutInfoSync(bundleName: string): Array { + function getShortcutInfoSyncWithBundleName(bundleName: string): Array { return launcherBundleManager.getShortcutInfoNative(bundleName, EMPTY_USER_ID, true); } - function getShortcutInfoSync(bundleName: string, userId: int): Array { + function getShortcutInfoSyncWithBundleNameUserId(bundleName: string, userId: int): Array { return launcherBundleManager.getShortcutInfoNative(bundleName, userId, true); } - function getShortcutInfo(bundleName: string, callback: AsyncCallback>): void { + overload getShortcutInfoSync { + getShortcutInfoSyncWithBundleName, + getShortcutInfoSyncWithBundleNameUserId + } + + function getShortcutInfoWithBundleNameCallback(bundleName: string, callback: AsyncCallback>): void { let cb = (): (Array) => { return launcherBundleManager.getShortcutInfoNative(bundleName, EMPTY_USER_ID, false); }; @@ -70,7 +75,7 @@ export default namespace launcherBundleManager { }); } - function getShortcutInfo(bundleName: string): Promise> { + function getShortcutInfoWithBundleNameReturnsPromise(bundleName: string): Promise> { let p = new Promise>((resolve: (arrShortcutInfo: Array) => void, reject: (error: BusinessError) => void) => { let cb = (): (Array) => { return launcherBundleManager.getShortcutInfoNative(bundleName, EMPTY_USER_ID, false); @@ -86,7 +91,12 @@ export default namespace launcherBundleManager { return p; } - function getLauncherAbilityInfo(bundleName: string, userId: int, callback: AsyncCallback, void>): void { + overload getShortcutInfo { + getShortcutInfoWithBundleNameCallback, + getShortcutInfoWithBundleNameReturnsPromise + } + + function getLauncherAbilityInfoWithBundleNameUserIdCallback(bundleName: string, userId: int, callback: AsyncCallback, void>): void { let cb = (): (Array) => { return launcherBundleManager.getLauncherAbilityInfoNative(bundleName, userId, false); }; @@ -99,7 +109,7 @@ export default namespace launcherBundleManager { }); } - function getLauncherAbilityInfo(bundleName: string, userId: int): Promise> { + function getLauncherAbilityInfoWithBundleNameUserIdReturnsPromise(bundleName: string, userId: int): Promise> { let p = new Promise>((resolve: (arrLauncherAbilityInfo: Array) => void, reject: (error: BusinessError) => void) => { let cb = (): (Array) => { return launcherBundleManager.getLauncherAbilityInfoNative(bundleName, userId, false); @@ -115,11 +125,16 @@ export default namespace launcherBundleManager { return p; } + overload getLauncherAbilityInfo { + getLauncherAbilityInfoWithBundleNameUserIdCallback, + getLauncherAbilityInfoWithBundleNameUserIdReturnsPromise + } + function getLauncherAbilityInfoSync(bundleName: string, userId: int): Array { return launcherBundleManager.getLauncherAbilityInfoNative(bundleName, userId, true); } - function getAllLauncherAbilityInfo(userId: int, callback: AsyncCallback, void>): void { + function getAllLauncherAbilityInfoWithUserIdCallback(userId: int, callback: AsyncCallback, void>): void { let cb = (): (Array) => { return launcherBundleManager.getAllLauncherAbilityInfoNative(userId); }; @@ -132,7 +147,7 @@ export default namespace launcherBundleManager { }); } - function getAllLauncherAbilityInfo(userId: int): Promise>{ + function getAllLauncherAbilityInfoWithUserIdReturnsPromise(userId: int): Promise>{ let p = new Promise>((resolve: (arrLauncherAbilityInfo: Array) => void, reject: (error: BusinessError) => void) => { let cb = (): (Array) => { return launcherBundleManager.getAllLauncherAbilityInfoNative(userId); @@ -148,6 +163,11 @@ export default namespace launcherBundleManager { return p; } + overload getAllLauncherAbilityInfo { + getAllLauncherAbilityInfoWithUserIdCallback, + getAllLauncherAbilityInfoWithUserIdReturnsPromise + } + function startShortcutWithReason(shortcutInfo: ShortcutInfo, startReason: string, options?: StartOptions): Promise { let p = new Promise((resolve: (v:undefined) => void, reject: (error: BusinessError) => void): void => { let startOptions : StartOptions = {}; diff --git a/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets b/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets index 73cd5d7f87263220a1dfac3229bd41d66de2b559..938d6251194d5acc2e3dd543e4180dcb671cdd8e 100644 --- a/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets +++ b/interfaces/kits/ani/overlay/ets/@ohos.bundle.overlay.ets @@ -32,7 +32,7 @@ export default namespace overlay { export native function getOverlayModuleInfoByBundleNameNative(bundleName: string, moduleName: string): Array; export native function getTargetOverlayModuleInfosByBundleNameNative(targetBundleName: string, moduleName: string): Array; - function setOverlayEnabled(moduleName: string, isEnabled: boolean, callback: AsyncCallback): void { + function setOverlayEnabledWithModuleNameIsEnabledCallback(moduleName: string, isEnabled: boolean, callback: AsyncCallback): void { let cb = (): void => { return overlay.setOverlayEnabledNative(moduleName, isEnabled); }; @@ -44,7 +44,7 @@ export default namespace overlay { }); } - function setOverlayEnabled(moduleName: string, isEnabled: boolean): Promise { + function setOverlayEnabledWithModuleNameIsEnabledReturnsPromise(moduleName: string, isEnabled: boolean): Promise { let p = new Promise((resolve: (v: PromiseLike) => void, reject: (error: BusinessError) => void) : void => { let cb = (): void => { return overlay.setOverlayEnabledNative(moduleName, isEnabled); @@ -60,7 +60,12 @@ export default namespace overlay { return p; } - function setOverlayEnabledByBundleName(bundleName: string, moduleName: string, isEnabled: boolean, callback: AsyncCallback): void { + overload setOverlayEnabled { + setOverlayEnabledWithModuleNameIsEnabledCallback, + setOverlayEnabledWithModuleNameIsEnabledReturnsPromise + } + + function setOverlayEnabledByBundleNameWithBundleNameModuleNameIsEnabledCallback(bundleName: string, moduleName: string, isEnabled: boolean, callback: AsyncCallback): void { let cb = (): void => { return overlay.setOverlayEnabledByBundleNameNative(bundleName, moduleName, isEnabled); }; @@ -72,7 +77,7 @@ export default namespace overlay { }); } - function setOverlayEnabledByBundleName(bundleName: string, moduleName: string, isEnabled: boolean): Promise { + function setOverlayEnabledByBundleNameWithBundleNameModuleNameIsEnabledReturnsPromise(bundleName: string, moduleName: string, isEnabled: boolean): Promise { let p = new Promise((resolve: (v: PromiseLike) => void, reject: (error: BusinessError) => void) : void => { let cb = (): void => { return overlay.setOverlayEnabledByBundleNameNative(bundleName, moduleName, isEnabled); @@ -88,7 +93,12 @@ export default namespace overlay { return p; } - function getOverlayModuleInfo(moduleName: string, callback: AsyncCallback): void { + overload setOverlayEnabledByBundleName { + setOverlayEnabledByBundleNameWithBundleNameModuleNameIsEnabledCallback, + setOverlayEnabledByBundleNameWithBundleNameModuleNameIsEnabledReturnsPromise + } + + function getOverlayModuleInfoWithModuleNameCallback(moduleName: string, callback: AsyncCallback): void { let cb = (): OverlayModuleInfo => { return overlay.getOverlayModuleInfoNative(moduleName); }; @@ -101,7 +111,7 @@ export default namespace overlay { }); } - function getOverlayModuleInfo(moduleName: string): Promise { + function getOverlayModuleInfoWithModuleNameReturnsPromise(moduleName: string): Promise { let p = new Promise((resolve: (overlayModuleInfo: OverlayModuleInfo) => void, reject: (error: BusinessError) => void) => { let cb = (): OverlayModuleInfo => { return overlay.getOverlayModuleInfoNative(moduleName); @@ -117,7 +127,12 @@ export default namespace overlay { return p; } - function getTargetOverlayModuleInfos(targetModuleName: string, callback: AsyncCallback>): void { + overload getOverlayModuleInfo { + getOverlayModuleInfoWithModuleNameCallback, + getOverlayModuleInfoWithModuleNameReturnsPromise + } + + function getTargetOverlayModuleInfosWithTargetModuleNameCallback(targetModuleName: string, callback: AsyncCallback>): void { let cb = (): (Array) => { return overlay.getTargetOverlayModuleInfosNative(targetModuleName); }; @@ -130,7 +145,7 @@ export default namespace overlay { }); } - function getTargetOverlayModuleInfos(targetModuleName: string): Promise> { + function getTargetOverlayModuleInfosWithTargetModuleNameReturnsPromise(targetModuleName: string): Promise> { let p = new Promise>((resolve: (arrOverlayModuleInfo: Array) => void, reject: (error: BusinessError) => void) => { let cb = (): (Array) => { return overlay.getTargetOverlayModuleInfosNative(targetModuleName); @@ -146,7 +161,12 @@ export default namespace overlay { return p; } - function getOverlayModuleInfoByBundleName(bundleName: string, callback: AsyncCallback>): void { + overload getTargetOverlayModuleInfos { + getTargetOverlayModuleInfosWithTargetModuleNameCallback, + getTargetOverlayModuleInfosWithTargetModuleNameReturnsPromise + } + + function getOverlayModuleInfoByBundleNameWithBundleNameCallback(bundleName: string, callback: AsyncCallback>): void { let cb = (): (Array) => { return overlay.getOverlayModuleInfoByBundleNameNative(bundleName, ''); }; @@ -159,7 +179,7 @@ export default namespace overlay { }); } - function getOverlayModuleInfoByBundleName(bundleName: string, moduleName: string, callback: AsyncCallback>): void { + function getOverlayModuleInfoByBundleNameWithBundleNameModuleNameCallback(bundleName: string, moduleName: string, callback: AsyncCallback>): void { let cb = (): (Array) => { return overlay.getOverlayModuleInfoByBundleNameNative(bundleName, moduleName); }; @@ -172,7 +192,7 @@ export default namespace overlay { }); } - function getOverlayModuleInfoByBundleName(bundleName: string, moduleName?: string): Promise> { + function getOverlayModuleInfoByBundleNameWithBundleNameModuleNameReturnsPromise(bundleName: string, moduleName?: string): Promise> { let moduleNameInfo: string = moduleName ?? ''; let p = new Promise>((resolve: (arrOverlayModuleInfo: Array) => void, reject: (error: BusinessError) => void) => { let cb = (): (Array) => { @@ -189,7 +209,13 @@ export default namespace overlay { return p; } - function getTargetOverlayModuleInfosByBundleName(targetBundleName: string, callback: AsyncCallback>): void { + overload getOverlayModuleInfoByBundleName { + getOverlayModuleInfoByBundleNameWithBundleNameCallback, + getOverlayModuleInfoByBundleNameWithBundleNameModuleNameCallback, + getOverlayModuleInfoByBundleNameWithBundleNameModuleNameReturnsPromise + } + + function getTargetOverlayModuleInfosByBundleNameWithTargetBundleNameCallback(targetBundleName: string, callback: AsyncCallback>): void { let cb = (): (Array) => { return overlay.getTargetOverlayModuleInfosByBundleNameNative(targetBundleName, ''); }; @@ -202,7 +228,7 @@ export default namespace overlay { }); } - function getTargetOverlayModuleInfosByBundleName(targetBundleName: string, moduleName: string, callback: AsyncCallback>): void { + function getTargetOverlayModuleInfosByBundleNameWithTargetBundleNameModuleNameCallback(targetBundleName: string, moduleName: string, callback: AsyncCallback>): void { let cb = (): (Array) => { return overlay.getTargetOverlayModuleInfosByBundleNameNative(targetBundleName, moduleName); }; @@ -215,7 +241,7 @@ export default namespace overlay { }); } - function getTargetOverlayModuleInfosByBundleName(targetBundleName: string, moduleName?: string): Promise> { + function getTargetOverlayModuleInfosByBundleNameWithTargetBundleNameModuleNameReturnsPromise(targetBundleName: string, moduleName?: string): Promise> { let moduleNameInfo: string = moduleName ?? ''; let p = new Promise>((resolve: (arrOverlayModuleInfo: Array) => void, reject: (error: BusinessError) => void) => { let cb = (): (Array) => { @@ -232,5 +258,11 @@ export default namespace overlay { return p; } + overload getTargetOverlayModuleInfosByBundleName { + getTargetOverlayModuleInfosByBundleNameWithTargetBundleNameCallback, + getTargetOverlayModuleInfosByBundleNameWithTargetBundleNameModuleNameCallback, + getTargetOverlayModuleInfosByBundleNameWithTargetBundleNameModuleNameReturnsPromise + } + export type OverlayModuleInfo = _OverlayModuleInfo; } 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..73210d64f73cc11cc074b168890c547be7cfebaa 100644 --- a/interfaces/kits/ani/resource_manager/ets/@ohos.bundle.bundleResourceManager.ets +++ b/interfaces/kits/ani/resource_manager/ets/@ohos.bundle.bundleResourceManager.ets @@ -44,38 +44,48 @@ export default namespace bundleResourceManager { export native function getAllLauncherAbilityResourceInfoNative(resourceFlags: int): Array; export native function getExtensionAbilityResourceInfoNative(bundleName: string, extensionAbilityType: bundleManager.ExtensionAbilityType, resourceFlags: int, appIndex: int): Array; - function getBundleResourceInfo(bundleName: string, resourceFlags?: int): BundleResourceInfo + function getBundleResourceInfoWithBundleNameResourceFlags(bundleName: string, resourceFlags?: int): BundleResourceInfo { let resFlag = resourceFlags ?? INVALID_VALUE; return bundleResourceManager.getBundleResourceInfoNative(bundleName, resFlag, INVALID_VALUE); } - function getBundleResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): BundleResourceInfo + function getBundleResourceInfoWithBundleNameResourceFlagsAppIndex(bundleName: string, resourceFlags?: int, appIndex?: int): BundleResourceInfo { let resFlag = resourceFlags ?? INVALID_VALUE; let appIdx = appIndex ?? INVALID_VALUE; return bundleResourceManager.getBundleResourceInfoNative(bundleName, resFlag, appIdx); } - function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int): Array + overload getBundleResourceInfo { + getBundleResourceInfoWithBundleNameResourceFlags, + getBundleResourceInfoWithBundleNameResourceFlagsAppIndex + } + + function getLauncherAbilityResourceInfoWithBundleNameResourceFlags(bundleName: string, resourceFlags?: int): Array { let resFlag = resourceFlags ?? INVALID_VALUE; return bundleResourceManager.getLauncherAbilityResourceInfoNative(bundleName, resFlag, INVALID_VALUE); } - function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): Array + function getLauncherAbilityResourceInfoWithBundleNameResourceFlagsAppIndex(bundleName: string, resourceFlags?: int, appIndex?: int): Array { let resFlag = resourceFlags ?? INVALID_VALUE; let appIdx = appIndex ?? INVALID_VALUE; return bundleResourceManager.getLauncherAbilityResourceInfoNative(bundleName, resFlag, appIdx); } + overload getLauncherAbilityResourceInfo { + getLauncherAbilityResourceInfoWithBundleNameResourceFlags, + getLauncherAbilityResourceInfoWithBundleNameResourceFlagsAppIndex + } + function getExtensionAbilityResourceInfo(bundleName: string, extensionAbilityType: bundleManager.ExtensionAbilityType, resourceFlags: int, appIndex?: int): Array { let appIdx = appIndex ?? INVALID_VALUE; return getExtensionAbilityResourceInfoNative(bundleName, extensionAbilityType, resourceFlags, appIdx); } - function getAllBundleResourceInfo(resourceFlags: int, callback: AsyncCallback>): void { + function getAllBundleResourceInfoWithResourceFlagsCallback(resourceFlags: int, callback: AsyncCallback>): void { let cb = (): (Array) => { return bundleResourceManager.getAllBundleResourceInfoNative(resourceFlags); }; @@ -88,7 +98,7 @@ export default namespace bundleResourceManager { }); } - function getAllBundleResourceInfo(resourceFlags: int): Promise> { + function getAllBundleResourceInfoWithResourceFlagsReturnsPromise(resourceFlags: int): Promise> { let p = new Promise>((resolve: (arrBundleResourceInfo: Array) => void, reject: (error: BusinessError) => void) => { let cb = (): (Array) => { return bundleResourceManager.getAllBundleResourceInfoNative(resourceFlags); @@ -104,7 +114,12 @@ export default namespace bundleResourceManager { return p; } - function getAllLauncherAbilityResourceInfo(resourceFlags: int, callback: AsyncCallback>): void { + overload getAllBundleResourceInfo { + getAllBundleResourceInfoWithResourceFlagsCallback, + getAllBundleResourceInfoWithResourceFlagsReturnsPromise + } + + function getAllLauncherAbilityResourceInfoWithResourceFlagsCallback(resourceFlags: int, callback: AsyncCallback>): void { let cb = (): (Array) => { return bundleResourceManager.getAllLauncherAbilityResourceInfoNative(resourceFlags); }; @@ -117,7 +132,7 @@ export default namespace bundleResourceManager { }); } - function getAllLauncherAbilityResourceInfo(resourceFlags: int): Promise> { + function getAllLauncherAbilityResourceInfoWithResourceFlagsReturnsPromise(resourceFlags: int): Promise> { let p = new Promise>((resolve: (arrLauncherAbilityResourceInfo: Array) => void, reject: (error: BusinessError) => void) => { let cb = (): (Array) => { return bundleResourceManager.getAllLauncherAbilityResourceInfoNative(resourceFlags); @@ -132,4 +147,9 @@ export default namespace bundleResourceManager { }); return p; } + + overload getAllLauncherAbilityResourceInfo { + getAllLauncherAbilityResourceInfoWithResourceFlagsCallback, + getAllLauncherAbilityResourceInfoWithResourceFlagsReturnsPromise + } } \ No newline at end of file diff --git a/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets b/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets index bb431f88e4c30251193b6f3060443f563a1415ed..e0ddcbfd13bfa5a8ece280d920a26637f0d7e58b 100644 --- a/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets +++ b/interfaces/kits/ani/zlib/ets/@ohos.zlib.ets @@ -92,7 +92,7 @@ export default namespace zlib { statusMsg: string; } - export function compressFile(inFile: string, outFile: string, options: Options, callback: AsyncCallback): void { + export function compressFileWithInFileOutFileOptionsCallback(inFile: string, outFile: string, options: Options, callback: AsyncCallback): void { let execFun = (): void => { zlib.compressFileNative(inFile, outFile, options); }; @@ -105,7 +105,7 @@ export default namespace zlib { }); } - export function compressFile(inFile: string, outFile: string, options: Options): Promise { + export function compressFileWithInFileOutFileOptionsReturnsPromise(inFile: string, outFile: string, options: Options): Promise { let p: Promise = new Promise((resolve: (v:PromiseLike) => void, reject: (error: Error) => void) : void => { let execFun = (): void => { zlib.compressFileNative(inFile, outFile, options); @@ -120,9 +120,14 @@ export default namespace zlib { return p; } + overload compressFile { + compressFileWithInFileOutFileOptionsCallback, + compressFileWithInFileOutFileOptionsReturnsPromise + } + export native function compressFileNative(inFile: string, outFile: string, options: Options): void; - export function decompressFile(inFile: string, outFile: string, options: Options, callback: AsyncCallback): void { + export function decompressFileWithInFileOutFileOptionsCallback(inFile: string, outFile: string, options: Options, callback: AsyncCallback): void { let execFun = (): void => { zlib.decompressFileNative(inFile, outFile, options); }; @@ -135,7 +140,7 @@ export default namespace zlib { }); } - export function decompressFile(inFile: string, outFile: string, callback: AsyncCallback): void { + export function decompressFileWithInFileOutFileCallback(inFile: string, outFile: string, callback: AsyncCallback): void { let execFun = (): void => { zlib.decompressFileNative(inFile, outFile, new OptionsInner()); }; @@ -148,7 +153,7 @@ export default namespace zlib { }); } - export function decompressFile(inFile: string, outFile: string, options?: Options): Promise { + export function decompressFileWithInFileOutFileOptionsReturnsPromise(inFile: string, outFile: string, options?: Options): Promise { let optionsParam = options ?? new OptionsInner(); let p: Promise = new Promise((resolve: (v:PromiseLike) => void, reject: (error: Error) => void) : void => { let execFun = (): void => { @@ -164,6 +169,12 @@ export default namespace zlib { return p; } + overload decompressFile { + decompressFileWithInFileOutFileOptionsCallback, + decompressFileWithInFileOutFileCallback, + decompressFileWithInFileOutFileOptionsReturnsPromise + } + export native function decompressFileNative(inFile: string, outFile: string, options?: Options): void; export interface Checksum {