diff --git a/frameworks/ets/ets/@ohos.notificationManager.ets b/frameworks/ets/ets/@ohos.notificationManager.ets index 29c001dc874ddf4b88d38cd88aba6d1298fb1ea8..578ce51c431dab5d5d4536cfe742308c1ceca4d8 100644 --- a/frameworks/ets/ets/@ohos.notificationManager.ets +++ b/frameworks/ets/ets/@ohos.notificationManager.ets @@ -698,7 +698,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): long => { return nativeGetSlotNumByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : long = data as long; resolve(ret); }, (error: Error): void => { @@ -717,7 +717,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): long => { return nativeGetSlotNumByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : long = data as long; callback(null, ret); }, (error: Error): void => { @@ -739,7 +739,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeSetSlotByBundle(bundle, slot); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -758,7 +758,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSetSlotByBundle(bundle, slot); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -772,7 +772,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeRemoveAllSlots(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -783,7 +783,7 @@ export default namespace notificationManager { export function removeAllSlots(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeRemoveAllSlots(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -797,7 +797,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeRemoveSlot(slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -808,7 +808,7 @@ export default namespace notificationManager { export function removeSlot(slotType: SlotType): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeRemoveSlot(slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -820,7 +820,7 @@ export default namespace notificationManager { export function getSlots(): Promise> { let pPromise = new Promise>((resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetSlots(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; resolve(ret); }, (error: Error): void => { @@ -835,7 +835,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): Array => { return nativeGetSlots(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; callback(null, ret); }, (error: Error): void => { @@ -847,7 +847,7 @@ export default namespace notificationManager { export function getSlot(slotType: SlotType): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): NotificationSlot => { return nativeGetSlot(slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationSlot = data as NotificationSlot; resolve(ret); }, (error: Error): void => { @@ -862,7 +862,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): NotificationSlot => { return nativeGetSlot(slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationSlot = data as NotificationSlot; callback(null, ret); }, (error: Error): void => { @@ -878,7 +878,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): NotificationSlot => { return nativeGetSlotByBundle(bundle, slotType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationSlot = data as NotificationSlot; resolve(ret); }, (error: Error): void => { @@ -894,7 +894,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeAddSlots(slots); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -911,7 +911,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeAddSlots(slots); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -926,7 +926,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeAddSlotByNotificationSlot(slot); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -944,7 +944,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeAddSlotByNotificationSlot(slot); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -957,7 +957,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeAddSlotBySlotType(type); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -968,7 +968,7 @@ export default namespace notificationManager { export function addSlot(type: SlotType): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeAddSlotBySlotType(type); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -985,7 +985,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSetNotificationEnable(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1004,7 +1004,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeSetNotificationEnable(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1022,7 +1022,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithBundleOption(bundleOption); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -1041,7 +1041,7 @@ export default namespace notificationManager { let p = taskpool.execute( (): boolean => { return nativeIsNotificationEnabledWithBundleOption(bundleOption); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1057,7 +1057,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -1070,7 +1070,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabledWithId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1086,7 +1086,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabled(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -1099,7 +1099,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsNotificationEnabled(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1126,7 +1126,7 @@ export default namespace notificationManager { let p = taskpool.execute( (): void => { nativeSetNotificationEnableSlotWithForce(bundle, type, enable, isForceControl); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1149,7 +1149,7 @@ export default namespace notificationManager { let p = taskpool.execute( (): void => { nativeSetNotificationEnableSlotWithForce(bundle, type, enable, forceControl); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1169,7 +1169,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeSetNotificationEnableSlot(bundle, type, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1185,7 +1185,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsNotificationSlotEnabled(bundle, type); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1205,7 +1205,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsNotificationSlotEnabled(bundle, type); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -1224,7 +1224,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): Array => { return nativeGetSlotsByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let slots : Array = data as Array; callback(null, slots); }, (error: Error): void => { @@ -1242,7 +1242,7 @@ export default namespace notificationManager { let pPromise = new Promise>( (resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetSlotsByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let slots : Array = data as Array; resolve(slots); }, (error: Error): void => { @@ -1259,7 +1259,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSetSlotFlagsByBundle(bundle, slotFlags); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1275,7 +1275,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): long => { return nativeGetSlotFlagsByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : long = data as long; resolve(ret); }, (error: Error): void => { @@ -1294,7 +1294,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativePublish(request); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1309,7 +1309,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativePublish(request); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1327,7 +1327,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativePublishWithUserId(request, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1342,7 +1342,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativePublishWithUserId(request, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1366,7 +1366,7 @@ export default namespace notificationManager { let p = taskpool.execute((): void => { nativeTriggerSystemLiveView(bundle, notificationId, buttonOptions); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1382,7 +1382,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSubscribeSystemLiveView(subscriber); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1397,7 +1397,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeRemoveDoNotDisturbProfile(templates); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1412,7 +1412,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeAddDoNotDisturbProfile(templates); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1426,7 +1426,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): Array => { return nativeGetAllActiveNotifications(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; callback(null, ret); }, (error: Error): void => { @@ -1440,7 +1440,7 @@ export default namespace notificationManager { = new Promise>( (resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetAllActiveNotifications(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; resolve(ret); }, (error: Error): void => { @@ -1453,7 +1453,7 @@ export default namespace notificationManager { export function getActiveNotifications(): Promise> { let pPromise = new Promise>((resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetActiveNotifications(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; resolve(ret); }, (error: Error): void => { @@ -1468,7 +1468,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): Array => { return nativeGetActiveNotifications(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : Array = data as Array; callback(null, ret); }, (error: Error): void => { @@ -1483,7 +1483,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): long => { return nativeGetActiveNotificationCount(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : long = data as long; callback(null, ret); }, (error: Object): void => { @@ -1495,7 +1495,7 @@ export default namespace notificationManager { export function getActiveNotificationCount(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback):void => { let p = taskpool.execute((): long => { return nativeGetActiveNotificationCount(); }); - p.then((data :NullishType): void => { + p.then((data :Any): void => { let ret : long = data as long; resolve(ret); }, (err:Error): void => { @@ -1514,7 +1514,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeDisplayBadge(bundle, enable); }); - p.then((e: NullishType): void => { + p.then((e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1529,7 +1529,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeDisplayBadge(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1544,7 +1544,7 @@ export default namespace notificationManager { throw error; } let p = taskpool.execute((): boolean => { return nativeIsBadgeDisplayed(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -1560,7 +1560,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsBadgeDisplayed(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1577,7 +1577,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeCancelWithBundle(bundle, id); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1589,7 +1589,7 @@ export default namespace notificationManager { export function cancel(id: int, label?: string): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeCancelWithIdOptionalLabel(id, label); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1606,7 +1606,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeCancelWithIdLabel(id, label); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1619,7 +1619,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeCancelWithId(id); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1630,7 +1630,7 @@ export default namespace notificationManager { export function cancelAll(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeCancelAll(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1644,7 +1644,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeCancelAll(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1660,7 +1660,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): Promise => { return nativeRequestEnableNotification(context); }); p.then( - (data: NullishType): void => { + (data: Any): void => { if (data == undefined) { reject(rejectInternalError); } else { @@ -1687,7 +1687,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): Promise => { return nativeRequestEnableNotification(context); }); p.then( - (data: NullishType): void => { + (data: Any): void => { if (data == undefined) { callback(callbackInternalError, undefined); } else { @@ -1737,7 +1737,7 @@ export default namespace notificationManager { }; let p = callback(checkInfo); await p.then( - (e: NullishType): void => { + (e: Any): void => { result = e as notificationManager.NotificationCheckResult; }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1798,7 +1798,7 @@ export default namespace notificationManager { let pPromise = new Promise>( (resolve: ResolveCallback>, reject: RejectCallback): void => { let p = taskpool.execute((): Array => { return nativeGetAllNotificationEnabledBundles(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let options : Array = data as Array; resolve(options); }, (error: Error): void => { @@ -1819,7 +1819,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeSetBadgeNumber(badgeNumber); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -1830,7 +1830,7 @@ export default namespace notificationManager { export function setBadgeNumber(badgeNumber: int): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSetBadgeNumber(badgeNumber); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1847,7 +1847,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSetBadgeNumberByBundle(bundle, badgeNumber); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1866,7 +1866,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): NotificationRequest => { return nativeGetActiveNotificationByFilter(filter); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationRequest = data as NotificationRequest; callback(null, ret); }, (error: Object): void => { @@ -1883,7 +1883,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): NotificationRequest => { return nativeGetActiveNotificationByFilter(filter); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationRequest = data as NotificationRequest; resolve(ret); }, (error: Error): void => { @@ -1897,7 +1897,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsSupportTemplate(templateName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -1920,7 +1920,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeRemoveGroupByBundle(bundle, groupName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -1939,7 +1939,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeRemoveGroupByBundle(bundle, groupName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -1962,7 +1962,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativePublishAsBundle(request, representativeBundle, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -1981,7 +1981,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativePublishAsBundle(request, representativeBundle, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2002,7 +2002,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativePublishAsBundleWithBundleOption(representativeBundle, request); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2020,7 +2020,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeCancelAsBundle(id, representativeBundle, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -2035,7 +2035,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeCancelAsBundle(id, representativeBundle, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2053,7 +2053,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeCancelAsBundleWithBundleOption(representativeBundle, id); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2071,7 +2071,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeCancelGroup(groupName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2086,7 +2086,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeCancelGroup(groupName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2105,7 +2105,7 @@ export default namespace notificationManager { throw error; } let p = taskpool.execute((): void => { nativeSetDoNotDisturbDate(date); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2121,7 +2121,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSetDoNotDisturbDate(date); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2140,7 +2140,7 @@ export default namespace notificationManager { throw error; } let p = taskpool.execute((): void => { nativeSetDoNotDisturbDateWithId(date, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2156,7 +2156,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSetDoNotDisturbDateWithId(date, userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2171,7 +2171,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDate(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; callback(null, doNotDisturbDate); }, (error: Object): void => { @@ -2184,7 +2184,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDate(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; resolve(doNotDisturbDate); }, (error: Error): void => { @@ -2200,7 +2200,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDateWithId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; callback(null, doNotDisturbDate); }, (error: Object): void => { @@ -2213,7 +2213,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): DoNotDisturbDate => { return nativeGetDoNotDisturbDateWithId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let doNotDisturbDate : DoNotDisturbDate = data as DoNotDisturbDate; resolve(doNotDisturbDate); }, (error: Error): void => { @@ -2229,7 +2229,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsSupportDoNotDisturbMode(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Object): void => { @@ -2244,7 +2244,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsSupportTemplate(templateName); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Object): void => { @@ -2257,7 +2257,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsSupportDoNotDisturbMode(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2271,7 +2271,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): DoNotDisturbProfile => { return nativeGetDoNotDisturbProfile(id); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : DoNotDisturbProfile = data as DoNotDisturbProfile; resolve(ret); }, (error: Error): void => { @@ -2289,7 +2289,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): Promise => { return nativeOpenNotificationSettings(context); }); p.then( - (data: NullishType): void => { + (data: Any): void => { if (data == undefined) { reject(rejectInternalError); } else { @@ -2312,7 +2312,7 @@ export default namespace notificationManager { export function setTargetDeviceStatus(deviceType: string, status: long): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativesetTargetDeviceStatus(deviceType,status); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2329,7 +2329,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativesetDistributedEnabledByBundle(bundle, deviceType, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2347,7 +2347,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativesetDistributedEnableByBundle(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2360,7 +2360,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativesetSmartReminderEnabled(deviceType, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2373,7 +2373,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeisSmartReminderEnabled(deviceType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2389,7 +2389,7 @@ export default namespace notificationManager { let p = taskpool.execute((): void => { nativesetDistributedEnabledBySlot(slot, deviceType, enabled); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2402,7 +2402,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeisDistributedEnabledBySlot(slot, deviceType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2415,7 +2415,7 @@ export default namespace notificationManager { export function setAdditionalConfig(key: string, value: string): Promise{ let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): int => { return nativesetAdditionalConfig(key,value); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : int = data as int; resolve(ret); }, (error: Error): void => { @@ -2430,7 +2430,7 @@ export default namespace notificationManager { let p = taskpool.execute((): void => { nativedisableNotificationFeature(disabled,bundleList); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2449,7 +2449,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativesetDistributedEnableByBundle(bundle, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2463,7 +2463,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): void => { nativeSetDistributedEnable(enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -2475,7 +2475,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSetDistributedEnable(enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2488,7 +2488,7 @@ export default namespace notificationManager { { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabled(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2504,7 +2504,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabled(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -2521,7 +2521,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabledByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2542,7 +2542,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabledByBundle(bundle); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -2559,7 +2559,7 @@ export default namespace notificationManager { } let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeIsDistributedEnabledByBundleType(bundle, deviceType); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2574,7 +2574,7 @@ export default namespace notificationManager { let pPromise = new Promise( (resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): DeviceRemindType => { return nativeGetDeviceRemindType(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : DeviceRemindType = data as DeviceRemindType; resolve(ret); }, (error: Error): void => { @@ -2590,7 +2590,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): DeviceRemindType => { return nativeGetDeviceRemindType(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : DeviceRemindType = data as DeviceRemindType; callback(null, ret); }, (error: Error): void => { @@ -2607,7 +2607,7 @@ export default namespace notificationManager { } let p = taskpool.execute((): void => { nativeSetSyncNotificationEnabledWithoutApp(userId, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -2620,7 +2620,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { nativeSetSyncNotificationEnabledWithoutApp(userId, enable); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -2633,7 +2633,7 @@ export default namespace notificationManager { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return nativeGetSyncNotificationEnabledWithoutApp(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -2649,7 +2649,7 @@ export default namespace notificationManager { throw errorParamInvalid; } let p = taskpool.execute((): boolean => { return nativeGetSyncNotificationEnabledWithoutApp(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -2663,7 +2663,7 @@ export default namespace notificationManager { (resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): NotificationSetting => { return nativeGetNotificationSetting(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : NotificationSetting = data as NotificationSetting; resolve(ret); }, (error: Error): void => { diff --git a/frameworks/ets/ets/@ohos.notificationSubscribe.ets b/frameworks/ets/ets/@ohos.notificationSubscribe.ets index c428ffb4371b3190200808b892cf2cc2aebd5d9e..e165635fddff3366e16172348c2a235a089eee2d 100644 --- a/frameworks/ets/ets/@ohos.notificationSubscribe.ets +++ b/frameworks/ets/ets/@ohos.notificationSubscribe.ets @@ -90,7 +90,7 @@ export default namespace notificationSubscribe { } let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber) }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -108,7 +108,7 @@ export default namespace notificationSubscribe { } let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber, info) }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -123,7 +123,7 @@ export default namespace notificationSubscribe { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void =>{ let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribe(subscriber, info)}); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -139,7 +139,7 @@ export default namespace notificationSubscribe { } let p = taskpool.execute((): void => { notificationSubscribe.nativeUnSubscribe(subscriber) }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -155,7 +155,7 @@ export default namespace notificationSubscribe { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void =>{ let p = taskpool.execute((): void => { notificationSubscribe.nativeUnSubscribe(subscriber) }); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -178,7 +178,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(bundle, notificationKey, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -200,7 +200,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(bundle, notificationKey, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -218,7 +218,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(hashCode, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -236,7 +236,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(hashCode, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -254,7 +254,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(hashCodes, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -272,7 +272,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemove(hashCodes, reason); }); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -295,7 +295,7 @@ export default namespace notificationSubscribe { } }); p.then( - (e: NullishType): void => { + (e: Any): void => { if (e == undefined) { reject(rejectInternalError); } @@ -330,7 +330,7 @@ export default namespace notificationSubscribe { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void =>{ let p = taskpool.execute((): void => { notificationSubscribe.nativeSubscribeSelf(subscriber)}); p.then( - (e: NullishType): void => { + (e: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -352,7 +352,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemoveAllForBundle(bundle); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -371,7 +371,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemoveAllForBundle(bundle); } }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -388,7 +388,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemoveAll(); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -405,7 +405,7 @@ export default namespace notificationSubscribe { notificationSubscribe.nativeRemoveAllForUserId(userId); }); p.then( - (e: NullishType): void => { + (e: Any): void => { callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -417,7 +417,7 @@ export default namespace notificationSubscribe { export function removeAll(userId: int): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): void => { notificationSubscribe.nativeRemoveAllForUserId(userId); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); diff --git a/frameworks/ets/ets/notification/notificationContent.ets b/frameworks/ets/ets/notification/notificationContent.ets index 6813f4b2a211d54b3c33bc2af0e9b5510934a289..e11240771bea48555a4115ea8c548d6a5999bb2a 100644 --- a/frameworks/ets/ets/notification/notificationContent.ets +++ b/frameworks/ets/ets/notification/notificationContent.ets @@ -21,7 +21,7 @@ import { WantAgent } from '@ohos.app.ability.wantAgent'; type IconType = Resource | image.PixelMap; class RecordTools { - public static GetKeys(record: Record): Array { + public static GetKeys(record: Record): Array { try { let keys: Array = Object.keys(record); return keys;