diff --git a/frameworks/ets/ets/@ohos.notificationManager.ets b/frameworks/ets/ets/@ohos.notificationManager.ets index 999fa9b11c237c3ef3ae41cfa6fe072d1826c208..af982d448220cbcdf9d1401167a54f13dbab45d8 100644 --- a/frameworks/ets/ets/@ohos.notificationManager.ets +++ b/frameworks/ets/ets/@ohos.notificationManager.ets @@ -529,8 +529,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetNotificationEnable(bundle, enable); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -551,8 +550,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithBundleOption(bundleOption); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -592,8 +590,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithId(userId); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -627,8 +624,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabled(); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -670,8 +666,7 @@ export default namespace notificationManager { (): void => { return nativeSetNotificationEnableSlotWithForce(bundle, type, enable, isForceControl); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -716,8 +711,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeSetNotificationEnableSlot(bundle, type, enable); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -756,8 +750,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsNotificationSlotEnabled(bundle, type); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -779,8 +772,7 @@ export default namespace notificationManager { let p = taskpool.execute((): Array => { return nativeGetSlotsByBundle(bundle); }); p.then((data: NullishType): void => { let slots : Array = data as Array; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, slots); + callback(null, slots); }, (error: Object): void => { let slots : Array = []; let err: BusinessError = error as BusinessError; @@ -852,8 +844,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativePublish(request); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -888,8 +879,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativePublishWithUserId(request, userId); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1001,8 +991,7 @@ export default namespace notificationManager { let p = taskpool.execute((): Array => { return nativeGetAllActiveNotifications(); }); p.then((data: NullishType): void => { let ret : Array = data as Array; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let retData : Array = []; let err: BusinessError = error as BusinessError; @@ -1049,8 +1038,7 @@ export default namespace notificationManager { let p = taskpool.execute((): Array => { return nativeGetActiveNotifications(); }); p.then((data: NullishType): void => { let ret : Array = data as Array; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let retData : Array = []; let err: BusinessError = error as BusinessError; @@ -1083,8 +1071,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeDisplayBadge(bundle, enable); }); p.then((e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1115,8 +1102,7 @@ export default namespace notificationManager { let p = taskpool.execute((): boolean => { return nativeIsBadgeDisplayed(bundle); }); p.then((data: NullishType): void => { let ret : boolean = data as boolean; - let err: BusinessError = {code: 0, data: undefined}; - callback(err, ret); + callback(null, ret); }, (error: Object): void => { let ret : boolean = false; let err: BusinessError = error as BusinessError; @@ -1193,8 +1179,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeCancelWithIdLabel(id, label); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1211,8 +1196,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeCancelWithId(id); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1241,8 +1225,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { return nativeCancelAll(); }); p.then((data: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -1290,7 +1273,7 @@ export default namespace notificationManager { } else { let result: int = data as int; if (result == 0) { - callback(successCallbackError, undefined); + callback(null, undefined); } else { callback(callbackInternalError, undefined); } diff --git a/frameworks/ets/ets/@ohos.notificationSubscribe.ets b/frameworks/ets/ets/@ohos.notificationSubscribe.ets index b6f13916283b7d13f561d645c822027451a7d2e8..925cc8afc14ee1730008df91bd0ad04cd3b6926f 100644 --- a/frameworks/ets/ets/@ohos.notificationSubscribe.ets +++ b/frameworks/ets/ets/@ohos.notificationSubscribe.ets @@ -66,8 +66,7 @@ export default namespace notificationSubscribe { let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber) }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -85,8 +84,7 @@ export default namespace notificationSubscribe { let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber, info) }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -117,8 +115,7 @@ export default namespace notificationSubscribe { let p = taskpool.execute((): void => { notificationSubscribe.nativeUnSubscribe(subscriber) }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -157,8 +154,7 @@ export default namespace notificationSubscribe { }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined); @@ -198,8 +194,7 @@ export default namespace notificationSubscribe { }); p.then( (e: NullishType): void => { - let err: BusinessError = {code: 0, data: undefined}; - callback(err, undefined); + callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; callback(err, undefined);