diff --git a/frameworks/ets/ani/BUILD.gn b/frameworks/ets/ani/BUILD.gn index f487ec8a1225f3956c9d5fa7ec48d2bfa9ee867f..427cb12b23075d966657009ec0c1ada7a786c393 100644 --- a/frameworks/ets/ani/BUILD.gn +++ b/frameworks/ets/ani/BUILD.gn @@ -24,7 +24,6 @@ group("ani_packages") { "${ability_runtime_path}/frameworks/ets/ani/form_extension_ability:form_extension_ability_etc", "${ability_runtime_path}/frameworks/ets/ani/insight_intent/insight_intent_driver:insight_intent_driver_ani_kit", "${ability_runtime_path}/frameworks/ets/ani/native_constructor:context_ani", - "${ability_runtime_path}/frameworks/ets/ani/uri_permission_manager:uri_permission_manager_abc_etc", "${ability_runtime_path}/frameworks/ets/ani/uri_permission_manager:uri_permission_manager_ani_kit", "${ability_runtime_path}/frameworks/ets/ani/wantagent:aniwantagent", "${ability_runtime_path}/frameworks/ets/ani/application:application_ani", diff --git a/frameworks/ets/ani/ani_common/src/ani_common_util.cpp b/frameworks/ets/ani/ani_common/src/ani_common_util.cpp index d8a6a8587762bbfd149955f2b3f3777756053b52..918b030885bbe11dd9f655d42b9abc9fee66b7e9 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_util.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_util.cpp @@ -625,22 +625,26 @@ bool AsyncCallback(ani_env *env, ani_object call, ani_object error, ani_object r ani_class clsCall {}; if ((status = env->FindClass(CLASSNAME_ASYNC_CALLBACK_WRAPPER, &clsCall)) != ANI_OK) { - TAG_LOGE(AAFwkTag::JSNAPI, "status: %{public}d", status); + TAG_LOGE(AAFwkTag::JSNAPI, "FindClass status: %{public}d", status); return false; } ani_method method {}; - if ((status = env->Class_FindMethod( - clsCall, "invoke", "L@ohos/base/BusinessError;Lstd/core/Object;:V", &method)) != ANI_OK) { - TAG_LOGE(AAFwkTag::JSNAPI, "status: %{public}d", status); + if ((status = env->Class_FindMethod(clsCall, "invoke", nullptr, &method)) != ANI_OK) { + TAG_LOGE(AAFwkTag::JSNAPI, "Class_FindMethod status: %{public}d", status); return false; } - if (result == nullptr) { + if (error == nullptr) { ani_ref nullRef = nullptr; env->GetNull(&nullRef); - result = reinterpret_cast(nullRef); + error = reinterpret_cast(nullRef); + } + if (result == nullptr) { + ani_ref undefinedRef = nullptr; + env->GetUndefined(&undefinedRef); + result = reinterpret_cast(undefinedRef); } if ((status = env->Object_CallMethod_Void(call, method, error, result)) != ANI_OK) { - TAG_LOGE(AAFwkTag::JSNAPI, "status: %{public}d", status); + TAG_LOGE(AAFwkTag::JSNAPI, "Object_CallMethod_Void status: %{public}d", status); return false; } return true; diff --git a/frameworks/ets/ani/uri_permission_manager/BUILD.gn b/frameworks/ets/ani/uri_permission_manager/BUILD.gn index 45039ec05ed7f5b6dc3377d95a1ca637a48829d1..db4c22e2905d6954536192eaa98a7d9547744a97 100644 --- a/frameworks/ets/ani/uri_permission_manager/BUILD.gn +++ b/frameworks/ets/ani/uri_permission_manager/BUILD.gn @@ -82,24 +82,4 @@ ohos_shared_library("uri_permission_manager_ani_kit") { innerapi_tags = [ "platformsdk" ] subsystem_name = "ability" part_name = "ability_runtime" -} - -generate_static_abc("uri_permission_manager_abc") { - base_url = "./ets" - - files = [ "./ets/@ohos.application.uriPermissionManager.ets" ] - - dst_file = "$target_out_dir/uri_permission_manager.abc" - out_puts = [ "$target_out_dir/uri_permission_manager.abc" ] - - is_boot_abc = "True" - device_dst_file = "/system/framework/uri_permission_manager.abc" -} - -ohos_prebuilt_etc("uri_permission_manager_abc_etc") { - source = "$target_out_dir/uri_permission_manager.abc" - module_install_dir = "framework" - subsystem_name = "ability" - part_name = "ability_runtime" - deps = [ ":uri_permission_manager_abc" ] } \ No newline at end of file diff --git a/frameworks/ets/ani/uri_permission_manager/src/sts_uri_perm_mgr.cpp b/frameworks/ets/ani/uri_permission_manager/src/sts_uri_perm_mgr.cpp index 638650677fb2b7c6e57b637d2d2612bccad40551..a0e850698d08a30cc95cf7b500de7e6751115092 100644 --- a/frameworks/ets/ani/uri_permission_manager/src/sts_uri_perm_mgr.cpp +++ b/frameworks/ets/ani/uri_permission_manager/src/sts_uri_perm_mgr.cpp @@ -151,13 +151,13 @@ void StsUriPermissionManagerInit(ani_env *env) ani_native_function { "grantUriPermissionCallbackSync", "Lstd/core/String;L@ohos/app/ability/wantConstant/wantConstant/Flags;Lstd/core/String;D" - "L@ohos/application/uriPermissionManager/AsyncCallbackWrapper;:V", + "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", reinterpret_cast(grantUriPermissionCallbackSync) }, ani_native_function { "revokeUriPermissionCallbackSync", "Lstd/core/String;Lstd/core/String;D" - "L@ohos/application/uriPermissionManager/AsyncCallbackWrapper;:V", + "Lutils/AbilityUtils/AsyncCallbackWrapper;:V", reinterpret_cast(revokeUriPermissionCallbackSync) }, }; diff --git a/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets b/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets index a8fceeb56bb19f8585e346ab93064edf53243878..f8ff010733011697551719e1b66892352d0cb239 100644 --- a/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets +++ b/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets @@ -19,14 +19,14 @@ import Want from '@ohos.app.ability.Want'; export default class InsightIntentContext { nativeContext: long; - public native nativeStartAbilitySync(want: Want): BusinessError; + public native nativeStartAbilitySync(want: Want): BusinessError; startAbility(want: Want, callback: AsyncCallback): void { - let p1 = taskpool.execute((): BusinessError => { + let p1 = taskpool.execute((): BusinessError => { return this.nativeStartAbilitySync(want); }); p1.then((e: NullishType) => { - let retError = e as BusinessError; + let retError = e as BusinessError; callback(retError, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); @@ -34,12 +34,12 @@ export default class InsightIntentContext { } startAbility(want: Want): Promise { - let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { - let p1 = taskpool.execute((): BusinessError => { + let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { + let p1 = taskpool.execute((): BusinessError => { return this.nativeStartAbilitySync(want); }); p1.then((e: NullishType) => { - let retError = e as BusinessError; + let retError = e as BusinessError; if (retError.code === 0) { resolve(undefined); } else { diff --git a/frameworks/ets/ets/@ohos.app.ability.UIExtensionContentSession.ets b/frameworks/ets/ets/@ohos.app.ability.UIExtensionContentSession.ets index 64066274f0fc4b10972509ef3686851fea241597..d7ef4faf27003319f21a3871775ffa08e5fce6c9 100644 --- a/frameworks/ets/ets/@ohos.app.ability.UIExtensionContentSession.ets +++ b/frameworks/ets/ets/@ohos.app.ability.UIExtensionContentSession.ets @@ -50,9 +50,9 @@ export default class UIExtensionContentSession { } terminateSelf(): Promise { - let p = new Promise((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + let p = new Promise((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -73,9 +73,9 @@ export default class UIExtensionContentSession { } terminateSelfWithResult(parameter: AbilityResult): Promise { - let p = new Promise((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + let p = new Promise((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); diff --git a/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets b/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets index 274a24fc0af837e4077fcee9f2a9c1d7ccb4765b..69763b9ef7b55dadde753f1860fa91087ac2b0c5 100644 --- a/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets +++ b/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets @@ -54,10 +54,10 @@ export default namespace abilityManager { } export function getTopAbility():Promise { - let p = new Promise((resolve: (data: ElementName)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: ElementName)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise((resolve: (data: ElementName)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: ElementName | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as ElementName); } else { reject(err); } diff --git a/frameworks/ets/ets/@ohos.app.ability.appManager.ets b/frameworks/ets/ets/@ohos.app.ability.appManager.ets index fe4df6bd34b107bc516fa8cc2ec8f0a51c9fa134..6d7c3ea3549b1835a8887eceae92faca78b53bdc 100644 --- a/frameworks/ets/ets/@ohos.app.ability.appManager.ets +++ b/frameworks/ets/ets/@ohos.app.ability.appManager.ets @@ -79,9 +79,9 @@ export class KeepAliveBundleInfoInner implements KeepAliveBundleInfo { export native function nativePreloadApplication(callback: AsyncCallbackWrapper, bundleName: string, userId: number, mode: PreloadMode, appIndex?: number): void; export function preloadApplication(bundleName: string, userId: number, mode: PreloadMode, appIndex?: number): Promise{ - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -103,10 +103,10 @@ export function getRunningProcessInformation(callback: AsyncCallback> { - let p = new Promise>((resolve:(data:Array)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper>((err: BusinessError, data: Array)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise>((resolve:(data:Array)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper>((err: BusinessError | null, data: Array | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as Array); } else { reject(err); } @@ -127,10 +127,10 @@ export function getForegroundApplications(callback: AsyncCallback> { - let p = new Promise>((resolve:(data:Array)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper>((err: BusinessError, data: Array)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise>((resolve:(data:Array)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper>((err: BusinessError | null, data: Array | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as Array); } else { reject(err); } @@ -144,10 +144,10 @@ export function getForegroundApplications(): Promise> { export native function nativeGetRunningMultiAppInfo(bundleName: string, callback: AsyncCallbackWrapper): void; export function getRunningMultiAppInfo(bundleName: string): Promise { - let p = new Promise((resolve:(data: RunningMultiAppInfo)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: RunningMultiAppInfo)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise((resolve:(data: RunningMultiAppInfo)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: RunningMultiAppInfo | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as RunningMultiAppInfo); } else { reject(err); } @@ -168,10 +168,10 @@ export function getRunningProcessInfoByBundleName(bundleName: string, callback: } export function getRunningProcessInfoByBundleName(bundleName: string): Promise> { - let p = new Promise>((resolve:(data: Array)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper>((err: BusinessError, data: Array)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise>((resolve:(data: Array)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper>((err: BusinessError | null, data: Array | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as Array); } else { reject(err); } @@ -193,10 +193,10 @@ export function getRunningProcessInfoByBundleName(bundleName: string, userId: nu } export function getRunningProcessInfoByBundleName(bundleName: string, userId: number): Promise> { - let p = new Promise>((resolve:(data: Array)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper>((err: BusinessError, data: Array)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise>((resolve:(data: Array)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper>((err: BusinessError | null, data: Array | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as Array); } else { reject(err); } @@ -228,9 +228,9 @@ export function off(type: 'applicationState', observerId: number, callback: Asyn } export function off(type: 'applicationState', observerId: number): Promise { - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -252,10 +252,10 @@ export function getAppMemorySize(callback: AsyncCallback): void }); } export function getAppMemorySize(): Promise { - let p = new Promise((resolve:(data:number)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: number)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise((resolve:(data:number)=>void, reject:(err: BusinessError | null)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as number); } else { reject(err); } @@ -275,10 +275,10 @@ export function isRamConstrainedDevice(callback: AsyncCallback): void { }); } export function isRamConstrainedDevice(): Promise { - let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: boolean)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError | null)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as boolean); } else { reject(err); } @@ -298,10 +298,10 @@ export function isRunningInStabilityTest(callback: AsyncCallback): void }); } export function isRunningInStabilityTest(): Promise { - let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: boolean)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise((resolve:(data:boolean)=>void, reject:(err: BusinessError | null)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as boolean); } else { reject(err); } @@ -322,9 +322,9 @@ export function killProcessesByBundleName(bundleName: string, callback: AsyncCal }); } export function killProcessesByBundleName(bundleName: string): Promise { - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -337,9 +337,9 @@ export function killProcessesByBundleName(bundleName: string): Promise { return p; } export function killProcessesByBundleName(bundleName: string, clearPageStack: boolean, appIndex?: number): Promise { - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); diff --git a/frameworks/ets/ets/@ohos.app.ability.application.ets b/frameworks/ets/ets/@ohos.app.ability.application.ets index 6dae2e49dd51d50dc8a786839d588cebe57e8cd3..f5654b6c45f1843a24c35983615414f68b1a83c4 100644 --- a/frameworks/ets/ets/@ohos.app.ability.application.ets +++ b/frameworks/ets/ets/@ohos.app.ability.application.ets @@ -27,10 +27,10 @@ export default namespace application { export function createModuleContext(context: Context, moduleName: string): Promise { let p = - new Promise((resolve: (data: Context) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: Context) => { - if (err.code == 0) { - resolve(data); + new Promise((resolve: (data: Context) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: Context | undefined) => { + if (err == null || err.code == 0) { + resolve(data as Context); } else { reject(err); } @@ -44,10 +44,10 @@ export default namespace application { export function createModuleContext(context: Context, bundleName: string, moduleName: string): Promise { let p = - new Promise((resolve: (data: Context) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: Context) => { - if (err.code == 0) { - resolve(data); + new Promise((resolve: (data: Context) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: Context | undefined) => { + if (err == null || err.code == 0) { + resolve(data as Context); } else { reject(err); } @@ -61,10 +61,10 @@ export default namespace application { export function createBundleContext(context: Context, bundleName: string): Promise { let p = - new Promise((resolve: (data: Context) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: Context) => { - if (err.code == 0) { - resolve(data); + new Promise((resolve: (data: Context) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: Context | undefined) => { + if (err == null || err.code == 0) { + resolve(data as Context); } else { reject(err); } diff --git a/frameworks/ets/ets/@ohos.app.ability.insightIntentDriver.ets b/frameworks/ets/ets/@ohos.app.ability.insightIntentDriver.ets index 2d897c008b8d682e2d91feb2a2c7348d5163d08c..0f9362e7e4ab85e34024d2de98beea593b643dd9 100644 --- a/frameworks/ets/ets/@ohos.app.ability.insightIntentDriver.ets +++ b/frameworks/ets/ets/@ohos.app.ability.insightIntentDriver.ets @@ -49,11 +49,11 @@ export default namespace insightIntentDriver { export function execute(param: ExecuteParam): Promise { let pPromise = new Promise(( resolve: (data: insightIntent.ExecuteResult) => void, - reject: (error: BusinessError) => void) => { + reject: (err: BusinessError) => void) => { let pCallback = new AsyncCallbackWrapper(( - err: BusinessError, data: insightIntent.ExecuteResult) => { - if (err.code == 0) { - resolve(data); + err: BusinessError | null, data: insightIntent.ExecuteResult | undefined) => { + if (err == null || err.code == 0) { + resolve(data as insightIntent.ExecuteResult); } else { reject(err); } diff --git a/frameworks/ets/ets/@ohos.app.ability.wantAgent.ets b/frameworks/ets/ets/@ohos.app.ability.wantAgent.ets index dc084c94b9ad24b73d0631eeb405cdcc87eccb16..45ca57ebc0ca61327664043c1097403817b36e83 100644 --- a/frameworks/ets/ets/@ohos.app.ability.wantAgent.ets +++ b/frameworks/ets/ets/@ohos.app.ability.wantAgent.ets @@ -37,10 +37,10 @@ namespace wantAgent { }); } export function getBundleName(agent: WantAgent): Promise { - return new Promise((resolve: (data:string)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: string)=>{ - if (err.code == 0) { - resolve(data); + return new Promise((resolve: (data:string)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: string | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as string); } else { reject(err); } @@ -57,10 +57,10 @@ namespace wantAgent { }); } export function getUid(agent: WantAgent): Promise { - return new Promise((resolve: (data:number)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: number)=>{ - if (err.code == 0) { - resolve(data); + return new Promise((resolve: (data:number)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as number); } else { reject(err); } @@ -77,10 +77,10 @@ namespace wantAgent { }); } export function getWant(agent: WantAgent): Promise { - return new Promise((resolve: (data:Want)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: Want)=>{ - if (err.code == 0) { - resolve(data); + return new Promise((resolve: (data:Want)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: Want | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as Want); } else { reject(err); } @@ -97,9 +97,9 @@ namespace wantAgent { }); } export function cancel(agent: WantAgent): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -127,10 +127,10 @@ namespace wantAgent { }); } export function equal(agent: WantAgent, otherAgent: WantAgent): Promise { - return new Promise((resolve: (data:boolean)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: boolean)=>{ - if (err.code == 0) { - resolve(data); + return new Promise((resolve: (data:boolean)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: boolean | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as boolean); } else { reject(err); } @@ -147,10 +147,10 @@ namespace wantAgent { }); } export function getWantAgent(info: WantAgentInfo): Promise { - return new Promise((resolve: (data:WantAgent)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: WantAgent)=>{ - if (err.code == 0) { - resolve(data); + return new Promise((resolve: (data:WantAgent)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: WantAgent | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as WantAgent); } else { reject(err); } @@ -167,10 +167,10 @@ namespace wantAgent { }); } export function getOperationType(agent: WantAgent): Promise { - return new Promise((resolve: (data:number)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: number)=>{ - if (err.code == 0) { - resolve(data); + return new Promise((resolve: (data:number)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as number); } else { reject(err); } diff --git a/frameworks/ets/ani/uri_permission_manager/ets/@ohos.application.uriPermissionManager.ets b/frameworks/ets/ets/@ohos.application.uriPermissionManager.ets similarity index 84% rename from frameworks/ets/ani/uri_permission_manager/ets/@ohos.application.uriPermissionManager.ets rename to frameworks/ets/ets/@ohos.application.uriPermissionManager.ets index c586a2cca3900d702063c47e1a321be6b1c72e6f..307c7bb96610c8952fc8e8806a79866f39bf86b8 100644 --- a/frameworks/ets/ani/uri_permission_manager/ets/@ohos.application.uriPermissionManager.ets +++ b/frameworks/ets/ets/@ohos.application.uriPermissionManager.ets @@ -15,18 +15,7 @@ import wantConstant from '@ohos.app.ability.wantConstant'; import { BusinessError, AsyncCallback } from '@ohos.base'; - -export class AsyncCallbackWrapper { - myFun_:AsyncCallback = (err: BusinessError, data: T) => {} - - constructor(myFun:AsyncCallback){ - this.myFun_ = myFun; - } - - invoke(err: BusinessError, data: T) : void { - this.myFun_(err, data); - } -} +import AsyncCallbackWrapper from './utils/AbilityUtils'; export default namespace uriPermissionManager { loadLibrary("uri_permission_manager_ani_kit.z"); @@ -38,9 +27,13 @@ export default namespace uriPermissionManager { export function grantUriPermission(uri: string, flag: wantConstant.Flags, targetBundleName: string): Promise { let p:Promise = new Promise((resolve: (data: number)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: number)=>{ - if (err.code == 0) { - resolve(data); + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + if (err === null || err.code === 0) { + if (data === undefined) { + resolve(-1); + } else { + resolve(data); + } } else { reject(err); } @@ -55,8 +48,8 @@ export default namespace uriPermissionManager { export function grantUriPermission(uri: string, flag: wantConstant.Flags, targetBundleName: string, appCloneIndex: number): Promise { let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: number)=>{ - if (err.code == 0) { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + if (err === null || err.code === 0) { resolve(undefined); } else { reject(err); @@ -80,9 +73,13 @@ export default namespace uriPermissionManager { export function revokeUriPermission(uri: string, targetBundleName: string): Promise { let p:Promise = new Promise((resolve: (data: number)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: number)=>{ - if (err.code == 0) { - resolve(data); + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + if (err === null || err.code === 0) { + if (data === undefined) { + resolve(-1); + } else { + resolve(data); + } } else { reject(err); } @@ -96,8 +93,8 @@ export default namespace uriPermissionManager { export function revokeUriPermission(uri: string, targetBundleName: string, appCloneIndex: number): Promise { let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: number)=>{ - if (err.code == 0) { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + if (err === null || err.code === 0) { resolve(undefined); } else { reject(err); diff --git a/frameworks/ets/ets/BUILD.gn b/frameworks/ets/ets/BUILD.gn index cf3a702bf832c0ccaefec72c9b95e6601fab2ebf..8e1f151a9bcd6a5c996b324fac094aba18d4579b 100644 --- a/frameworks/ets/ets/BUILD.gn +++ b/frameworks/ets/ets/BUILD.gn @@ -859,6 +859,26 @@ generate_static_abc("ability_runtime_auto_fill_type_abc") { device_dst_file = "/system/framework/ability_runtime_auto_fill_type_abc.abc" } +generate_static_abc("uri_permission_manager_abc") { + base_url = "./" + + files = [ "./@ohos.application.uriPermissionManager.ets" ] + + dst_file = "$target_out_dir/uri_permission_manager.abc" + out_puts = [ "$target_out_dir/uri_permission_manager.abc" ] + + is_boot_abc = "True" + device_dst_file = "/system/framework/uri_permission_manager.abc" +} + +ohos_prebuilt_etc("uri_permission_manager_abc_etc") { + source = "$target_out_dir/uri_permission_manager.abc" + module_install_dir = "framework" + subsystem_name = "ability" + part_name = "ability_runtime" + deps = [ ":uri_permission_manager_abc" ] +} + ohos_prebuilt_etc("ability_runtime_auto_fill_type_abc_etc") { source = "$target_out_dir/ability_runtime_auto_fill_type_abc.abc" module_install_dir = "framework" @@ -935,6 +955,7 @@ group("ets_packages") { ":ability_runtime_want_constant_abc_etc", ":service_extension_ability_abc_etc", ":ui_extension_ability_ani_etc", + ":uri_permission_manager_abc_etc", ":ability_runtime_OpenLink_Options_abc_etc", ":ability_runtime_AbilityRunningInfo_abc_etc", ] diff --git a/frameworks/ets/ets/application/AbilityDelegator.ets b/frameworks/ets/ets/application/AbilityDelegator.ets index 45c9f02e73c0f12a6a73c9663feec5a2abe892db..6c6886ec4d213a3deac53776bab9786437a17b74 100644 --- a/frameworks/ets/ets/application/AbilityDelegator.ets +++ b/frameworks/ets/ets/application/AbilityDelegator.ets @@ -136,9 +136,9 @@ class AbilityDelegatorInner implements AbilityDelegator { } finishTest(msg: string, code: number): Promise { let p: Promise = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -166,10 +166,10 @@ class AbilityDelegatorInner implements AbilityDelegator { } executeShellCommand(cmd: string, timeoutSecs?: number): Promise { let p = new Promise((resolve: (data: ShellCmdResult) => void, - reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: ShellCmdResult) => { - if (err.code == 0) { - resolve(data); + reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: ShellCmdResult | undefined) => { + if (err == null || err.code == 0) { + resolve(data as ShellCmdResult); } else { reject(err); } @@ -193,9 +193,9 @@ class AbilityDelegatorInner implements AbilityDelegator { } addAbilityMonitor(monitor: AbilityMonitor): Promise { let p = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -422,9 +422,9 @@ class AbilityDelegatorInner implements AbilityDelegator { } startAbility(want: Want): Promise { let p: Promise = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); diff --git a/frameworks/ets/ets/application/ApplicationContext.ets b/frameworks/ets/ets/application/ApplicationContext.ets index f711c92f5a703ee55752ca49513d05134c3f0770..2eb05a84c5230c9cfb9d2b29fa134541147d09a6 100644 --- a/frameworks/ets/ets/application/ApplicationContext.ets +++ b/frameworks/ets/ets/application/ApplicationContext.ets @@ -54,9 +54,9 @@ export default class ApplicationContext extends Context { off(type: 'environment', callbackId: number): Promise { let p = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -71,9 +71,9 @@ export default class ApplicationContext extends Context { preloadUIExtensionAbility(want: Want): Promise { let p = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -95,9 +95,9 @@ export default class ApplicationContext extends Context { killAllProcesses(): Promise { let p = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -112,9 +112,9 @@ export default class ApplicationContext extends Context { killAllProcesses(clearPageStack: boolean): Promise { let p = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -136,11 +136,11 @@ export default class ApplicationContext extends Context { getRunningProcessInformation(): Promise> { let p = new Promise>((resolve: (data: Array) => void, - reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper>((err: BusinessError, - data: Array) => { - if (err.code == 0) { - resolve(data); + reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper>((err: BusinessError | null, + data: Array | undefined) => { + if (err == null || err.code == 0) { + resolve(data as Array); } else { reject(err); } @@ -161,9 +161,9 @@ export default class ApplicationContext extends Context { clearUpApplicationData(): Promise { let p = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); diff --git a/frameworks/ets/ets/application/ServiceExtensionContext.ets b/frameworks/ets/ets/application/ServiceExtensionContext.ets index e868ac50cdcc2aa8c081dd8f7b9efa9bbaf2253d..572c7974af7fa36aeaab4feda8936f92f572371c 100644 --- a/frameworks/ets/ets/application/ServiceExtensionContext.ets +++ b/frameworks/ets/ets/application/ServiceExtensionContext.ets @@ -38,9 +38,9 @@ export default class ServiceExtensionContext extends ExtensionContext { } terminateSelf(): Promise { - let p = new Promise((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + let p = new Promise((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -68,9 +68,9 @@ export default class ServiceExtensionContext extends ExtensionContext { } startAbility(want: Want, options: StartOptions): Promise { - let p = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + let p = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -91,9 +91,9 @@ export default class ServiceExtensionContext extends ExtensionContext { } startServiceExtensionAbility(want: Want): Promise { - let p = new Promise((resolve: (data: undefined)=>void, reject:(err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + let p = new Promise((resolve: (data: undefined)=>void, reject:(err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); diff --git a/frameworks/ets/ets/application/UIAbilityContext.ets b/frameworks/ets/ets/application/UIAbilityContext.ets index 1d45131c5b62542cd503936c35fc00bc5eef8cf7..ec1f2ca657510a77b460577aafca4daeda88a0a2 100644 --- a/frameworks/ets/ets/application/UIAbilityContext.ets +++ b/frameworks/ets/ets/application/UIAbilityContext.ets @@ -54,7 +54,7 @@ export default class UIAbilityContext extends Context { private native nativeTerminateSelfSync(callback:AsyncCallbackWrapper): void; private native nativeTerminateSelfWithResult(parameter: AbilityResult, callback:AsyncCallbackWrapper): void; private native nativeReportDrawnCompletedSync(callback:AsyncCallbackWrapper): void; - private native nativeStartAbilityByTypeSync(type: string, wantParam: Record, startCallback: AbilityStartCallback): BusinessError; + private native nativeStartAbilityByTypeSync(type: string, wantParam: Record, startCallback: AbilityStartCallback): BusinessError; private native nativeStartServiceExtensionAbilitySync(want: Want, callback: AsyncCallbackWrapper): void; private native nativeStartAbilityByCallSync(want: Want): Caller; private native nativeOpenLinkSync(link: string, myCallback:AsyncCallbackWrapper, options?: OpenLinkOptions, callback?: AsyncCallbackWrapper): void; @@ -77,9 +77,9 @@ export default class UIAbilityContext extends Context { } startAbility(want: Want): Promise { - let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -93,9 +93,9 @@ export default class UIAbilityContext extends Context { } startAbility(want: Want, options: StartOptions): Promise { - let p = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + let p = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -123,10 +123,10 @@ export default class UIAbilityContext extends Context { } startAbilityForResult(want: Want): Promise{ - let p = new Promise((resolve: (data: AbilityResult)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: AbilityResult)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise((resolve: (data: AbilityResult)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: AbilityResult | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as AbilityResult); } else { reject(err); } @@ -139,10 +139,10 @@ export default class UIAbilityContext extends Context { } startAbilityForResult(want: Want, startOptions: StartOptions): Promise { - let p = new Promise((resolve: (data: AbilityResult)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError, data: AbilityResult)=>{ - if (err.code == 0) { - resolve(data); + let p = new Promise((resolve: (data: AbilityResult)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: AbilityResult | undefined)=>{ + if (err == null || err.code == 0) { + resolve(data as AbilityResult); } else { reject(err); } @@ -162,9 +162,9 @@ export default class UIAbilityContext extends Context { } terminateSelf(): Promise { - let p = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + let p = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -185,9 +185,9 @@ export default class UIAbilityContext extends Context { } terminateSelfWithResult(parameter: AbilityResult): Promise{ - let p = new Promise((resolve: (data: undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError)=>{ - if (err.code == 0) { + let p = new Promise((resolve: (data: undefined)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null)=>{ + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -208,11 +208,11 @@ export default class UIAbilityContext extends Context { } startAbilityByType(type: string, wantParam: Record, startCallback: AbilityStartCallback, callback: AsyncCallback): void { - let p1 = taskpool.execute((): BusinessError => { + let p1 = taskpool.execute((): BusinessError => { return this.nativeStartAbilityByTypeSync(type, wantParam, startCallback); }); p1.then((e: NullishType) => { - let retError = e as BusinessError; + let retError = e as BusinessError; callback(retError, undefined); },(err: Error): void => { callback(err as BusinessError, undefined); @@ -220,12 +220,12 @@ export default class UIAbilityContext extends Context { } startAbilityByType(type: string, wantParam: Record, startCallback: AbilityStartCallback): Promise { - let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { - let p1 = taskpool.execute((): BusinessError => { + let p = new Promise((resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { + let p1 = taskpool.execute((): BusinessError => { return this.nativeStartAbilityByTypeSync(type, wantParam, startCallback); }); p1.then((e: NullishType) => { - let retError = e as BusinessError; + let retError = e as BusinessError; if (retError.code === 0) { resolve(undefined); } else { @@ -244,9 +244,9 @@ export default class UIAbilityContext extends Context { } startServiceExtensionAbility(want: Want): Promise { - let p = new Promise((resolve: (data: undefined)=>void, reject:(err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + let p = new Promise((resolve: (data: undefined)=>void, reject:(err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -264,7 +264,7 @@ export default class UIAbilityContext extends Context { } openLink(link: string, options?: OpenLinkOptions, callback?: AsyncCallback): Promise { - return new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + return new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { let finalOptions: OpenLinkOptions | undefined = undefined; if (options) { finalOptions = options; @@ -273,8 +273,8 @@ export default class UIAbilityContext extends Context { if (callback) { callParam = new AsyncCallbackWrapper(callback); } - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -295,9 +295,9 @@ export default class UIAbilityContext extends Context { } moveAbilityToBackground(): Promise { - return new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let syncCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + return new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let syncCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -317,9 +317,9 @@ export default class UIAbilityContext extends Context { } requestModalUIExtension(pickerWant: Want): Promise { - return new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let syncCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + return new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let syncCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); diff --git a/frameworks/ets/ets/application/UIExtensionContext.ets b/frameworks/ets/ets/application/UIExtensionContext.ets index 4d4c5c693e306b97537bc9e8f678ee0abb3769ed..087b44d830535068ddc8624ea89e0bfb71b6c3f5 100644 --- a/frameworks/ets/ets/application/UIExtensionContext.ets +++ b/frameworks/ets/ets/application/UIExtensionContext.ets @@ -35,9 +35,9 @@ export default class UIExtensionContext extends ExtensionContext { } terminateSelf(): Promise { - let p = new Promise((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + let p = new Promise((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -58,9 +58,9 @@ export default class UIExtensionContext extends ExtensionContext { } terminateSelfWithResult(parameter: AbilityResult): Promise { - let p = new Promise((resolve: (data: undefined)=>void, reject:(err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + let p = new Promise((resolve: (data: undefined)=>void, reject:(err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); @@ -89,9 +89,9 @@ export default class UIExtensionContext extends ExtensionContext { startAbility(want: Want, options: StartOptions): Promise { let p = - new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError) => { - if (err.code == 0) { + new Promise((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null) => { + if (err == null || err.code == 0) { resolve(undefined); } else { reject(err); diff --git a/frameworks/ets/ets/utils/AbilityUtils.ets b/frameworks/ets/ets/utils/AbilityUtils.ets index b12da5e18c399dfc1d833148b18a73b210c9ac9b..cf3f297f0c45870b5bd17df15be837c9c422a518 100644 --- a/frameworks/ets/ets/utils/AbilityUtils.ets +++ b/frameworks/ets/ets/utils/AbilityUtils.ets @@ -20,14 +20,14 @@ const DOMAIN_ID = 0xD001300; const TAG = 'AbilityUtils'; const LEVEL = 100; -export default class AsyncCallbackWrapper { - private myFun_:AsyncCallback = (err: BusinessError, data: T) => {} +export default class AsyncCallbackWrapper { + private myFun_: AsyncCallback = (err: BusinessError | null, data: T | undefined) => {} - constructor(myFun:AsyncCallback){ + constructor(myFun: AsyncCallback) { this.myFun_ = myFun; } - invoke(err: BusinessError, data: T) : void { + invoke(err: BusinessError | null, data: T | undefined): void { this.myFun_(err, data); } }