From 528e63bcf4752d4e40d6e65282b4d86246c007ad Mon Sep 17 00:00:00 2001
From: zhangzezhong <zhangzezhong8@huawei-partners.com>
Date: Tue, 27 May 2025 13:51:08 +0800
Subject: [PATCH] upd BusinessError

Signed-off-by: zhangzezhong <zhangzezhong8@huawei-partners.com>
---
 frameworks/ets/ani/BUILD.gn                   |  1 -
 .../ani/ani_common/src/ani_common_util.cpp    | 18 ++--
 .../ets/ani/uri_permission_manager/BUILD.gn   | 20 -----
 .../src/sts_uri_perm_mgr.cpp                  |  4 +-
 ...@ohos.app.ability.InsightIntentContext.ets | 12 +--
 ....app.ability.UIExtensionContentSession.ets | 12 +--
 .../ets/@ohos.app.ability.abilityManager.ets  |  8 +-
 .../ets/ets/@ohos.app.ability.appManager.ets  | 88 +++++++++----------
 .../ets/ets/@ohos.app.ability.application.ets | 24 ++---
 .../@ohos.app.ability.insightIntentDriver.ets |  8 +-
 .../ets/ets/@ohos.app.ability.wantAgent.ets   | 54 ++++++------
 ...@ohos.application.uriPermissionManager.ets | 41 ++++-----
 frameworks/ets/ets/BUILD.gn                   | 21 +++++
 .../ets/ets/application/AbilityDelegator.ets  | 26 +++---
 .../ets/application/ApplicationContext.ets    | 40 ++++-----
 .../application/ServiceExtensionContext.ets   | 18 ++--
 .../ets/ets/application/UIAbilityContext.ets  | 76 ++++++++--------
 .../ets/application/UIExtensionContext.ets    | 18 ++--
 frameworks/ets/ets/utils/AbilityUtils.ets     |  8 +-
 19 files changed, 249 insertions(+), 248 deletions(-)
 rename frameworks/ets/{ani/uri_permission_manager => }/ets/@ohos.application.uriPermissionManager.ets (84%)

diff --git a/frameworks/ets/ani/BUILD.gn b/frameworks/ets/ani/BUILD.gn
index f487ec8a122..427cb12b230 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 f1d852f507a..293ffa3c053 100644
--- a/frameworks/ets/ani/ani_common/src/ani_common_util.cpp
+++ b/frameworks/ets/ani/ani_common/src/ani_common_util.cpp
@@ -624,22 +624,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<ani_object>(nullRef);
+        error = reinterpret_cast<ani_object>(nullRef);
+    }
+    if (result == nullptr) {
+        ani_ref undefinedRef = nullptr;
+        env->GetUndefined(&undefinedRef);
+        result = reinterpret_cast<ani_object>(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 45039ec05ed..db4c22e2905 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 638650677fb..a0e850698d0 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<void*>(grantUriPermissionCallbackSync)
         },
         ani_native_function {
             "revokeUriPermissionCallbackSync",
             "Lstd/core/String;Lstd/core/String;D"
-            "L@ohos/application/uriPermissionManager/AsyncCallbackWrapper;:V",
+            "Lutils/AbilityUtils/AsyncCallbackWrapper;:V",
             reinterpret_cast<void*>(revokeUriPermissionCallbackSync)
         },
     };
diff --git a/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets b/frameworks/ets/ets/@ohos.app.ability.InsightIntentContext.ets
index a3d17fc26b4..40a7569f487 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<void>;
+  public native nativeStartAbilitySync(want: Want): BusinessError;
 
   startAbility(want: Want, callback: AsyncCallback<void>): void {
-    let p1 = taskpool.execute((): BusinessError<void> => {
+    let p1 = taskpool.execute((): BusinessError => {
       return this.nativeStartAbilitySync(want);
     });
     p1.then((e: NullishType) => {
-      let retError = e as BusinessError<void>;
+      let retError = e as BusinessError;
       callback(retError, undefined);
     }, (err: BusinessError): void => {
       callback(err, undefined);
@@ -34,12 +34,12 @@ export default class InsightIntentContext {
   }
 
   startAbility(want: Want): Promise<void> {
-    let p = new Promise<void>((resolve: (v: undefined) => void, reject: (error: BusinessError<void>) => void): void => {
-      let p1 = taskpool.execute((): BusinessError<void> => {
+    let p = new Promise<void>((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<void>;
+        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 64066274f0f..d7ef4faf270 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<void> {
-    let p = new Promise<void>((resolve: (data: undefined) => void, reject:(err: BusinessError<void>) => void): void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => {
+      let myCall = new AsyncCallbackWrapper<void>((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<void> {
-    let p = new Promise<void>((resolve: (data: undefined) => void, reject:(err: BusinessError<void>) => void): void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => {
+      let myCall = new AsyncCallbackWrapper<void>((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 cab0f1345fd..a0ee2381e77 100644
--- a/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets
+++ b/frameworks/ets/ets/@ohos.app.ability.abilityManager.ets
@@ -49,10 +49,10 @@ export default namespace abilityManager {
   }
 
   export function getTopAbility():Promise<ElementName> {
-    let p = new Promise<ElementName>((resolve: (data: ElementName)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<ElementName>((err: BusinessError<void>, data: ElementName)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<ElementName>((resolve: (data: ElementName)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<ElementName>((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 ddf0c98a6b7..c8e403129ab 100644
--- a/frameworks/ets/ets/@ohos.app.ability.appManager.ets
+++ b/frameworks/ets/ets/@ohos.app.ability.appManager.ets
@@ -76,9 +76,9 @@ export class KeepAliveBundleInfoInner implements KeepAliveBundleInfo {
 export native function nativePreloadApplication(callback: AsyncCallbackWrapper<void>, bundleName: string, userId: number,
     mode: PreloadMode, appIndex?: number): void;
 export function preloadApplication(bundleName: string, userId: number, mode: PreloadMode, appIndex?: number): Promise<void>{
-   let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+   let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError | null)=>{
+        if (err == null || err.code == 0) {
           resolve(undefined);
         } else {
           reject(err);
@@ -100,10 +100,10 @@ export function getRunningProcessInformation(callback: AsyncCallback<Array<Proce
 }
 
 export function getRunningProcessInformation(): Promise<Array<ProcessInformation>> {
-    let p = new Promise<Array<ProcessInformation>>((resolve:(data:Array<ProcessInformation>)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<Array<ProcessInformation>>((err: BusinessError<void>, data: Array<ProcessInformation>)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<Array<ProcessInformation>>((resolve:(data:Array<ProcessInformation>)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<Array<ProcessInformation>>((err: BusinessError | null, data: Array<ProcessInformation> | undefined)=>{
+        if (err == null || err.code == 0) {
+          resolve(data as Array<ProcessInformation>);
         } else {
           reject(err);
         }
@@ -124,10 +124,10 @@ export function getForegroundApplications(callback: AsyncCallback<Array<AppState
 }
 
 export function getForegroundApplications(): Promise<Array<AppStateData>> {
-    let p = new Promise<Array<AppStateData>>((resolve:(data:Array<AppStateData>)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<Array<AppStateData>>((err: BusinessError<void>, data: Array<AppStateData>)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<Array<AppStateData>>((resolve:(data:Array<AppStateData>)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<Array<AppStateData>>((err: BusinessError | null, data: Array<AppStateData> | undefined)=>{
+        if (err == null || err.code == 0) {
+          resolve(data as Array<AppStateData>);
         } else {
           reject(err);
         }
@@ -141,10 +141,10 @@ export function getForegroundApplications(): Promise<Array<AppStateData>> {
 
 export native function nativeGetRunningMultiAppInfo(bundleName: string, callback: AsyncCallbackWrapper<RunningMultiAppInfo>): void;
 export function getRunningMultiAppInfo(bundleName: string): Promise<RunningMultiAppInfo> {
-    let p = new Promise<RunningMultiAppInfo>((resolve:(data: RunningMultiAppInfo)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<RunningMultiAppInfo>((err: BusinessError<void>, data: RunningMultiAppInfo)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<RunningMultiAppInfo>((resolve:(data: RunningMultiAppInfo)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<RunningMultiAppInfo>((err: BusinessError | null, data: RunningMultiAppInfo | undefined)=>{
+        if (err == null || err.code == 0) {
+          resolve(data as RunningMultiAppInfo);
         } else {
           reject(err);
         }
@@ -165,10 +165,10 @@ export function getRunningProcessInfoByBundleName(bundleName: string, callback:
 }
 
 export function getRunningProcessInfoByBundleName(bundleName: string): Promise<Array<ProcessInformation>> {
-    let p = new Promise<Array<ProcessInformation>>((resolve:(data: Array<ProcessInformation>)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<Array<ProcessInformation>>((err: BusinessError<void>, data: Array<ProcessInformation>)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<Array<ProcessInformation>>((resolve:(data: Array<ProcessInformation>)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<Array<ProcessInformation>>((err: BusinessError | null, data: Array<ProcessInformation> | undefined)=>{
+        if (err == null || err.code == 0) {
+          resolve(data as Array<ProcessInformation>);
         } else {
           reject(err);
         }
@@ -190,10 +190,10 @@ export function getRunningProcessInfoByBundleName(bundleName: string, userId: nu
 }
 
 export function getRunningProcessInfoByBundleName(bundleName: string, userId: number): Promise<Array<ProcessInformation>> {
-    let p = new Promise<Array<ProcessInformation>>((resolve:(data: Array<ProcessInformation>)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<Array<ProcessInformation>>((err: BusinessError<void>, data: Array<ProcessInformation>)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<Array<ProcessInformation>>((resolve:(data: Array<ProcessInformation>)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<Array<ProcessInformation>>((err: BusinessError | null, data: Array<ProcessInformation> | undefined)=>{
+        if (err == null || err.code == 0) {
+          resolve(data as Array<ProcessInformation>);
         } else {
           reject(err);
         }
@@ -225,9 +225,9 @@ export function off(type: 'applicationState', observerId: number, callback: Asyn
 }
 
 export function off(type: 'applicationState', observerId: number): Promise<void> {
-    let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+    let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError | null)=>{
+        if (err == null || err.code == 0) {
           resolve(undefined);
         } else {
           reject(err);
@@ -249,10 +249,10 @@ export function getAppMemorySize(callback: AsyncCallback<number>): void
     });
 }
 export function getAppMemorySize(): Promise<number> {
-    let p = new Promise<number>((resolve:(data:number)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void>, data: number)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<number>((resolve:(data:number)=>void, reject:(err: BusinessError<void> | null)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void> | null, data: number | undefined)=>{
+        if (err == null || err.code == 0) {
+          resolve(data as number);
         } else {
           reject(err);
         }
@@ -272,10 +272,10 @@ export function isRamConstrainedDevice(callback: AsyncCallback<boolean>): void {
     });
 }
 export function isRamConstrainedDevice(): Promise<boolean> {
-    let p = new Promise<boolean>((resolve:(data:boolean)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<boolean>((err: BusinessError<void>, data: boolean)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<boolean>((resolve:(data:boolean)=>void, reject:(err: BusinessError<void> | null)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<boolean>((err: BusinessError<void> | null, data: boolean | undefined)=>{
+        if (err == null || err.code == 0) {
+          resolve(data as boolean);
         } else {
           reject(err);
         }
@@ -295,10 +295,10 @@ export function isRunningInStabilityTest(callback: AsyncCallback<boolean>): void
     });
 }
 export function isRunningInStabilityTest(): Promise<boolean> {
-    let p = new Promise<boolean>((resolve:(data:boolean)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<boolean>((err: BusinessError<void>, data: boolean)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<boolean>((resolve:(data:boolean)=>void, reject:(err: BusinessError<void> | null)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<boolean>((err: BusinessError<void> | null, data: boolean | undefined)=>{
+        if (err == null || err.code == 0) {
+          resolve(data as boolean);
         } else {
           reject(err);
         }
@@ -319,9 +319,9 @@ export function killProcessesByBundleName(bundleName: string, callback: AsyncCal
     });
 }
 export function killProcessesByBundleName(bundleName: string): Promise<void> {
-    let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+    let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void> | null)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void> | null)=>{
+        if (err == null || err.code == 0) {
           resolve(undefined);
         } else {
           reject(err);
@@ -334,9 +334,9 @@ export function killProcessesByBundleName(bundleName: string): Promise<void> {
     return p;
 }
 export function killProcessesByBundleName(bundleName: string, clearPageStack: boolean, appIndex?: number): Promise<void> {
-    let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+    let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void> | null)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void> | 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 6dae2e49dd5..f5654b6c45f 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<Context> {
     let p =
-      new Promise<Context>((resolve: (data: Context) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<Context>((err: BusinessError<void>, data: Context) => {
-          if (err.code == 0) {
-            resolve(data);
+      new Promise<Context>((resolve: (data: Context) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<Context>((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<Context> {
     let p =
-      new Promise<Context>((resolve: (data: Context) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<Context>((err: BusinessError<void>, data: Context) => {
-          if (err.code == 0) {
-            resolve(data);
+      new Promise<Context>((resolve: (data: Context) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<Context>((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<Context> {
     let p =
-      new Promise<Context>((resolve: (data: Context) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<Context>((err: BusinessError<void>, data: Context) => {
-          if (err.code == 0) {
-            resolve(data);
+      new Promise<Context>((resolve: (data: Context) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<Context>((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 2d897c008b8..0f9362e7e4a 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<insightIntent.ExecuteResult> {
     let pPromise = new Promise<insightIntent.ExecuteResult>((
       resolve: (data: insightIntent.ExecuteResult) => void,
-      reject: (error: BusinessError<void>) => void) => {
+      reject: (err: BusinessError) => void) => {
       let pCallback = new AsyncCallbackWrapper<insightIntent.ExecuteResult>((
-        err: BusinessError<void>, 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 dc084c94b9a..45ca57ebc0c 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<string> {
-    return new Promise<string>((resolve: (data:string)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<string>((err: BusinessError<void>, data: string)=>{
-        if (err.code == 0) {
-          resolve(data);
+    return new Promise<string>((resolve: (data:string)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<string>((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<number> {
-    return new Promise<number>((resolve: (data:number)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void>, data: number)=>{
-        if (err.code == 0) {
-          resolve(data);
+    return new Promise<number>((resolve: (data:number)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<number>((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<Want> {
-    return new Promise<Want>((resolve: (data:Want)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<Want>((err: BusinessError<void>, data: Want)=>{
-        if (err.code == 0) {
-          resolve(data);
+    return new Promise<Want>((resolve: (data:Want)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<Want>((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<void> {
-    return new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+    return new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((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<boolean> {
-    return new Promise<boolean>((resolve: (data:boolean)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<boolean>((err: BusinessError<void>, data: boolean)=>{
-        if (err.code == 0) {
-          resolve(data);
+    return new Promise<boolean>((resolve: (data:boolean)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<boolean>((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<WantAgent> {
-    return new Promise<WantAgent>((resolve: (data:WantAgent)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<WantAgent>((err: BusinessError<void>, data: WantAgent)=>{
-        if (err.code == 0) {
-          resolve(data);
+    return new Promise<WantAgent>((resolve: (data:WantAgent)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<WantAgent>((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<number> {
-    return new Promise<number>((resolve: (data:number)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void>, data: number)=>{
-        if (err.code == 0) {
-          resolve(data);
+    return new Promise<number>((resolve: (data:number)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<number>((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 c586a2cca39..307c7bb9661 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<T> {
-  myFun_:AsyncCallback<T, void> = (err: BusinessError<void>, data: T) => {}
-
-  constructor(myFun:AsyncCallback<T, void>){
-    this.myFun_ = myFun;
-  }
-
-  invoke(err: BusinessError<void>, 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<number> {
         let p:Promise<number> = new Promise<number>((resolve: (data: number)=>void, reject:(err: BusinessError<void>)=>void):void => {
-            let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void>, data: number)=>{
-                if (err.code == 0) {
-                    resolve(data);
+            let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void> | 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<void> {
         let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-            let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void>, data: number)=>{
-                if (err.code == 0) {
+            let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void> | 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<number> {
         let p:Promise<number> = new Promise<number>((resolve: (data: number)=>void, reject:(err: BusinessError<void>)=>void):void => {
-            let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void>, data: number)=>{
-                if (err.code == 0) {
-                    resolve(data);
+            let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void> | 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<void> {
         let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-            let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void>, data: number)=>{
-                if (err.code == 0) {
+            let myCall = new AsyncCallbackWrapper<number>((err: BusinessError<void> | 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 ae9a2fc41a8..2693748fbe6 100644
--- a/frameworks/ets/ets/BUILD.gn
+++ b/frameworks/ets/ets/BUILD.gn
@@ -800,6 +800,26 @@ ohos_prebuilt_etc("ability_runtime_insight_intent_executor_abc_etc") {
   deps = [ ":ability_runtime_insight_intent_executor_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" ]
+}
+
 group("ets_packages") {
   deps = [
     ":ability_ability_application_abc_etc",
@@ -848,6 +868,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",
   ]
 }
diff --git a/frameworks/ets/ets/application/AbilityDelegator.ets b/frameworks/ets/ets/application/AbilityDelegator.ets
index b2655d3e848..d50cad83ac1 100644
--- a/frameworks/ets/ets/application/AbilityDelegator.ets
+++ b/frameworks/ets/ets/application/AbilityDelegator.ets
@@ -73,9 +73,9 @@ class AbilityDelegatorInner implements AbilityDelegator {
   }
   finishTest(msg: string, code: number): Promise<void> {
     let p: Promise<void> =
-      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-          if (err.code == 0) {
+      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError | null) => {
+          if (err == null || err.code == 0) {
             resolve(undefined);
           } else {
             reject(err);
@@ -103,10 +103,10 @@ class AbilityDelegatorInner implements AbilityDelegator {
   }
   executeShellCommand(cmd: string, timeoutSecs?: number): Promise<ShellCmdResult> {
     let p = new Promise<ShellCmdResult>((resolve: (data: ShellCmdResult) => void,
-      reject: (err: BusinessError<void>) => void): void => {
-      let myCall = new AsyncCallbackWrapper<ShellCmdResult>((err: BusinessError<void>, data: ShellCmdResult) => {
-        if (err.code == 0) {
-          resolve(data);
+      reject: (err: BusinessError) => void): void => {
+      let myCall = new AsyncCallbackWrapper<ShellCmdResult>((err: BusinessError | null, data: ShellCmdResult | undefined) => {
+        if (err == null || err.code == 0) {
+          resolve(data as ShellCmdResult);
         } else {
           reject(err);
         }
@@ -130,9 +130,9 @@ class AbilityDelegatorInner implements AbilityDelegator {
   }
   addAbilityMonitor(monitor: AbilityMonitor): Promise<void> {
     let p =
-      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-          if (err.code == 0) {
+      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError | null) => {
+          if (err == null || err.code == 0) {
             resolve(undefined);
           } else {
             reject(err);
@@ -153,9 +153,9 @@ class AbilityDelegatorInner implements AbilityDelegator {
   }
   startAbility(want: Want): Promise<void> {
     let p: Promise<void> =
-      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-          if (err.code == 0) {
+      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<void>((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 f711c92f5a7..2eb05a84c52 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<void> {
     let p =
-      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-          if (err.code == 0) {
+      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<void>((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<void> {
     let p =
-      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-          if (err.code == 0) {
+      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<void>((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<void> {
     let p =
-      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-          if (err.code == 0) {
+      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<void>((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<void> {
     let p =
-      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-          if (err.code == 0) {
+      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<void>((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<Array<ProcessInformation>> {
     let p = new Promise<Array<ProcessInformation>>((resolve: (data: Array<ProcessInformation>) => void,
-      reject: (err: BusinessError<void>) => void): void => {
-      let myCall = new AsyncCallbackWrapper<Array<ProcessInformation>>((err: BusinessError<void>,
-        data: Array<ProcessInformation>) => {
-        if (err.code == 0) {
-          resolve(data);
+      reject: (err: BusinessError) => void): void => {
+      let myCall = new AsyncCallbackWrapper<Array<ProcessInformation>>((err: BusinessError | null,
+        data: Array<ProcessInformation> | undefined) => {
+        if (err == null || err.code == 0) {
+          resolve(data as Array<ProcessInformation>);
         } else {
           reject(err);
         }
@@ -161,9 +161,9 @@ export default class ApplicationContext extends Context {
 
   clearUpApplicationData(): Promise<void> {
     let p =
-      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-          if (err.code == 0) {
+      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<void>((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 51e455a55b3..e4d6a0551ff 100644
--- a/frameworks/ets/ets/application/ServiceExtensionContext.ets
+++ b/frameworks/ets/ets/application/ServiceExtensionContext.ets
@@ -37,9 +37,9 @@ export default class ServiceExtensionContext extends ExtensionContext {
   }
 
   terminateSelf(): Promise<void> {
-    let p = new Promise<void>((resolve: (data: undefined) => void, reject:(err: BusinessError<void>) => void): void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => {
+      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError | null) => {
+        if (err == null || err.code == 0) {
           resolve(undefined);
         } else {
           reject(err);
@@ -67,9 +67,9 @@ export default class ServiceExtensionContext extends ExtensionContext {
   }
 
   startAbility(want: Want, options: StartOptions): Promise<void> {
-    let p = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError | null)=>{
+        if (err == null || err.code == 0) {
           resolve(undefined);
         } else {
           reject(err);
@@ -90,9 +90,9 @@ export default class ServiceExtensionContext extends ExtensionContext {
   }
   
   startServiceExtensionAbility(want: Want): Promise<void> {
-    let p = new Promise<void>((resolve: (data: undefined)=>void, reject:(err: BusinessError<void>) => void): void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data: undefined)=>void, reject:(err: BusinessError) => void): void => {
+      let myCall = new AsyncCallbackWrapper<void>((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 cb57465023d..369f88ce50a 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>): void;
   private native nativeTerminateSelfWithResult(parameter: AbilityResult, callback:AsyncCallbackWrapper<void>): void;
   private native nativeReportDrawnCompletedSync(callback:AsyncCallbackWrapper<void>): void;
-  private native nativeStartAbilityByTypeSync(type: string, wantParam: Record<string, Object>, startCallback: AbilityStartCallback): BusinessError<void>;
+  private native nativeStartAbilityByTypeSync(type: string, wantParam: Record<string, Object>, startCallback: AbilityStartCallback): BusinessError;
   private native nativeStartServiceExtensionAbilitySync(want: Want, callback: AsyncCallbackWrapper<void>): void;
   private native nativeStartAbilityByCallSync(want: Want): Caller;
   private native nativeOpenLinkSync(link: string, myCallback:AsyncCallbackWrapper<void>, options?: OpenLinkOptions, callback?: AsyncCallbackWrapper<AbilityResult>): void;
@@ -77,9 +77,9 @@ export default class UIAbilityContext extends Context {
   }
 
   startAbility(want: Want): Promise<void> {
-    let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+    let p:Promise<void> = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((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<void> {
-    let p = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((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<AbilityResult>{
-    let p = new Promise<AbilityResult>((resolve: (data: AbilityResult)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<AbilityResult>((err: BusinessError<void>, data: AbilityResult)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<AbilityResult>((resolve: (data: AbilityResult)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<AbilityResult>((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<AbilityResult> {
-    let p = new Promise<AbilityResult>((resolve: (data: AbilityResult)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<AbilityResult>((err: BusinessError<void>, data: AbilityResult)=>{
-        if (err.code == 0) {
-          resolve(data);
+    let p = new Promise<AbilityResult>((resolve: (data: AbilityResult)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<AbilityResult>((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<void> {
-    let p = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((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<void>{
-    let p = new Promise<void>((resolve: (data: undefined)=>void, reject:(err: BusinessError<void>)=>void):void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>)=>{
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data: undefined)=>void, reject:(err: BusinessError)=>void):void => {
+      let myCall = new AsyncCallbackWrapper<void>((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<string, Object>, startCallback: AbilityStartCallback, callback: AsyncCallback<void>): void {
-    let p1 = taskpool.execute((): BusinessError<void> => {
+    let p1 = taskpool.execute((): BusinessError => {
       return this.nativeStartAbilityByTypeSync(type, wantParam, startCallback);
     });
     p1.then((e: NullishType) => {
-      let retError = e as BusinessError<void>;
+      let retError = e as BusinessError;
       callback(retError, undefined);
     },(err: BusinessError): void => {
       callback(err, undefined);
@@ -220,12 +220,12 @@ export default class UIAbilityContext extends Context {
   }
 
   startAbilityByType(type: string, wantParam: Record<string, Object>, startCallback: AbilityStartCallback): Promise<void> {
-    let p = new Promise<void>((resolve: (v: undefined) => void, reject: (error: BusinessError<void>) => void): void => {
-      let p1 = taskpool.execute((): BusinessError<void> => {
+    let p = new Promise<void>((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<void>;
+        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<void> {
-    let p = new Promise<void>((resolve: (data: undefined)=>void, reject:(err: BusinessError<void>) => void): void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data: undefined)=>void, reject:(err: BusinessError) => void): void => {
+      let myCall = new AsyncCallbackWrapper<void>((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<AbilityResult, void>): Promise<void> {
-    return new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
+    return new Promise<void>((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<AbilityResult>(callback);
       }
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+      let myCall = new AsyncCallbackWrapper<void>((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<void> {
-    return new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-      let syncCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+    return new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+      let syncCall = new AsyncCallbackWrapper<void>((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<void> {
-    return new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-      let syncCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+    return new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+      let syncCall = new AsyncCallbackWrapper<void>((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 4d4c5c693e3..087b44d8305 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<void> {
-    let p = new Promise<void>((resolve: (data: undefined) => void, reject:(err: BusinessError<void>) => void): void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data: undefined) => void, reject:(err: BusinessError) => void): void => {
+      let myCall = new AsyncCallbackWrapper<void>((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<void> {
-    let p = new Promise<void>((resolve: (data: undefined)=>void, reject:(err: BusinessError<void>) => void): void => {
-      let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-        if (err.code == 0) {
+    let p = new Promise<void>((resolve: (data: undefined)=>void, reject:(err: BusinessError) => void): void => {
+      let myCall = new AsyncCallbackWrapper<void>((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<void> {
     let p =
-      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError<void>) => void): void => {
-        let myCall = new AsyncCallbackWrapper<void>((err: BusinessError<void>) => {
-          if (err.code == 0) {
+      new Promise<void>((resolve: (data: undefined) => void, reject: (err: BusinessError) => void): void => {
+        let myCall = new AsyncCallbackWrapper<void>((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 b12da5e18c3..cf3f297f0c4 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<T> {
-  private myFun_:AsyncCallback<T, void> = (err: BusinessError<void>, data: T) => {}
+export default class AsyncCallbackWrapper<T, E = void> {
+  private myFun_: AsyncCallback<T, E> = (err: BusinessError<E> | null, data: T | undefined) => {}
 
-  constructor(myFun:AsyncCallback<T, void>){
+  constructor(myFun: AsyncCallback<T, E>) {
     this.myFun_ = myFun;
   }
 
-  invoke(err: BusinessError<void>, data: T) : void {
+  invoke(err: BusinessError<E> | null, data: T | undefined): void {
     this.myFun_(err, data);
   }
 }
-- 
Gitee