From ee399ea65a233e7d9d185c91e192d452f024b0b8 Mon Sep 17 00:00:00 2001 From: igorlegalov Date: Thu, 10 Jul 2025 15:36:43 +0300 Subject: [PATCH] Remove NullishType alias Issue: https://gitee.com/open_harmony/dashboard?issue_id=ICH95I Testing: all pre-merge tests passed Signed-off-by: igorlegalov --- .../ets/ani/ets/@ohos.telephony.data.ets | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/frameworks/ets/ani/ets/@ohos.telephony.data.ets b/frameworks/ets/ani/ets/@ohos.telephony.data.ets index 064be07f..2a503a79 100644 --- a/frameworks/ets/ani/ets/@ohos.telephony.data.ets +++ b/frameworks/ets/ani/ets/@ohos.telephony.data.ets @@ -35,7 +35,7 @@ export default namespace data { export function getCellularDataState(callback: AsyncCallback): void { let p1 = taskpool.execute(nativeGetCellularDataState) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(new BusinessError(), content as DataConnectState); }, (err: BusinessError): void => { callback(err, DataConnectState.DATA_STATE_UNKNOWN); @@ -45,7 +45,7 @@ export default namespace data { export function getCellularDataState(): Promise { return new Promise((resolve, reject) => { let p = taskpool.execute(nativeGetCellularDataState) - p.then((e: NullishType) => { + p.then((e: Any) => { let r = e as DataConnectState resolve(r) }).catch((e: Error): void => { @@ -56,7 +56,7 @@ export default namespace data { export function isCellularDataEnabled(callback: AsyncCallback): void { let p1 = taskpool.execute(nativeIsCellularDataEnabled) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(new BusinessError(), content as boolean); }, (err: Error): void => { callback(err as BusinessError, false); @@ -66,7 +66,7 @@ export default namespace data { export function isCellularDataEnabled(): Promise { return new Promise((resolve, reject) => { let p = taskpool.execute(nativeIsCellularDataEnabled) - p.then((e: NullishType) => { + p.then((e: Any) => { let r = e as boolean resolve(r) }).catch((e: Error): void => { @@ -201,7 +201,7 @@ export default namespace data { let p1 = taskpool.execute((): boolean => { return nativeIsCellularDataRoamingEnabled(slotId); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(new BusinessError(), content as boolean); }, (err: Error): void => { callback(err as BusinessError, false); @@ -213,7 +213,7 @@ export default namespace data { let p1 = taskpool.execute((): boolean => { return nativeIsCellularDataRoamingEnabled(slotId); }) - p1.then((e: NullishType) => { + p1.then((e: Any) => { let r = e as boolean resolve(r) }).catch((e: Error): void => { @@ -254,7 +254,7 @@ export default namespace data { let p1 = taskpool.execute((): DataFlowType => { return nativeGetCellularDataFlowType(); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(new BusinessError(), content as DataFlowType); }, (err: BusinessError): void => { callback(err, DataFlowType.DATA_FLOW_TYPE_NONE); @@ -265,7 +265,7 @@ export default namespace data { let p = taskpool.execute((): DataFlowType => { return nativeGetCellularDataFlowType(); }) - p.then((e: NullishType) => { + p.then((e: Any) => { let r = e as DataFlowType resolve(r) }).catch((e: Error): void => { @@ -279,7 +279,7 @@ export default namespace data { let p1 = taskpool.execute((): int => { return nativeGetDefaultCellularDataSlotIdSync(); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(new BusinessError(), content as int); }, (err: Error): void => { callback(err as BusinessError, 0); @@ -289,7 +289,7 @@ export default namespace data { return new Promise((resolve, reject) => { taskpool.execute((): int => { return nativeGetDefaultCellularDataSlotIdSync(); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as int); }, (err: Error): void => { reject(err as BusinessError); @@ -304,7 +304,7 @@ export default namespace data { let p1 = taskpool.execute((): boolean => { return nativeSetPreferredApn(apnId); }) - p1.then((e: NullishType) => { + p1.then((e: Any) => { let r = e as boolean resolve(r) }).catch((e: Error): void => { @@ -330,7 +330,7 @@ export default namespace data { let p1 = taskpool.execute((): Array => { return nativeQueryApnIds(apnInfo); }) - p1.then((e: NullishType) => { + p1.then((e: Any) => { let r = e as Array resolve(r) }).catch((e: Error): void => { @@ -345,7 +345,7 @@ export default namespace data { let p1 = taskpool.execute((): Array => { return nativeQueryAllApns(); }) - p1.then((e: NullishType) => { + p1.then((e: Any) => { let r = e as Array resolve(r) }).catch((e: Error): void => { @@ -361,7 +361,7 @@ export default namespace data { let p1 = taskpool.execute((): string => { return nativeGetActiveApnName(); }) - p1.then((e: NullishType) => { + p1.then((e: Any) => { let r = e as string resolve(r) }).catch((e: Error): void => { -- Gitee