From a56b253ecdeccd4497581c1819520b8d39408b1f Mon Sep 17 00:00:00 2001
From: igorlegalov <igorlegalov@huawei-partners.com>
Date: Thu, 10 Jul 2025 15:32:32 +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 <igorlegalov@huawei-partners.com>
---
 .../ets/ani/esim/ets/@ohos.telephony.esim.ets |  2 +-
 .../ani/radio/ets/@ohos.telephony.radio.ets   | 22 +++++-----
 .../ets/ani/sim/ets/@ohos.telephony.sim.ets   | 44 +++++++++----------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/frameworks/ets/ani/esim/ets/@ohos.telephony.esim.ets b/frameworks/ets/ani/esim/ets/@ohos.telephony.esim.ets
index b72c3b054..6d052376e 100644
--- a/frameworks/ets/ani/esim/ets/@ohos.telephony.esim.ets
+++ b/frameworks/ets/ani/esim/ets/@ohos.telephony.esim.ets
@@ -23,7 +23,7 @@ export default namespace eSIM {
   export function resetMemory(slotId: int, options?:ResetOption): Promise<ResultCode> {
     return new Promise<ResultCode>((resolve, reject) => {
       let p = taskpool.execute(nativeResetMemory, slotId, options)
-        p.then((e: NullishType) => {
+        p.then((e: Any) => {
           let r = e as ResultCode
           resolve(r)
         }).catch((e: Error): void => {
diff --git a/frameworks/ets/ani/radio/ets/@ohos.telephony.radio.ets b/frameworks/ets/ani/radio/ets/@ohos.telephony.radio.ets
index 016ef238f..8c7bfa94a 100644
--- a/frameworks/ets/ani/radio/ets/@ohos.telephony.radio.ets
+++ b/frameworks/ets/ani/radio/ets/@ohos.telephony.radio.ets
@@ -25,7 +25,7 @@ export default namespace radio {
       let p1 = taskpool.execute((): ImsRegInfo => {
         return nativeGetImsRegInfo(slotId, imsType)
       })
-      p1.then((content: NullishType) => {
+      p1.then((content: Any) => {
           callback(new BusinessError(), content as ImsRegInfo)
       }, (err: Error): void => {
           callback(err as BusinessError, undefined)
@@ -37,7 +37,7 @@ export default namespace radio {
         let p = taskpool.execute((): ImsRegInfo => {
           return nativeGetImsRegInfo(slotId, imsType)
         })
-        p.then((e: NullishType) => {
+        p.then((e: Any) => {
             let r = e as ImsRegInfo
             resolve(r)
         }).catch((e: Error): void => {
@@ -52,7 +52,7 @@ export default namespace radio {
       let p1 = taskpool.execute((): Array<SignalInformation> => {
         return nativeGetSignalInformation(slotId)
       })
-      p1.then((content: NullishType) => {
+      p1.then((content: Any) => {
           callback(new BusinessError(), content as Array<SignalInformation>)
       }, (err: Error): void => {
           callback(err as BusinessError, undefined)
@@ -64,7 +64,7 @@ export default namespace radio {
         let p = taskpool.execute((): Array<SignalInformation> => {
           return nativeGetSignalInformation(slotId)
         })
-        p.then((e: NullishType) => {
+        p.then((e: Any) => {
             let r = e as Array<SignalInformation>
             resolve(r)
         }).catch((e: Error): void => {
@@ -79,7 +79,7 @@ export default namespace radio {
       let p1 = taskpool.execute((): int => {
         return nativeGetPrimarySlotId()
       })
-      p1.then((content: NullishType) => {
+      p1.then((content: Any) => {
           callback(new BusinessError(), content as int)
       }, (err: Error): void => {
           callback(err as BusinessError, undefined)
@@ -91,7 +91,7 @@ export default namespace radio {
         let p = taskpool.execute((): int => {
           return nativeGetPrimarySlotId()
         })
-        p.then((e: NullishType) => {
+        p.then((e: Any) => {
             let r = e as int
             resolve(r)
         }).catch((e: Error): void => {
@@ -106,19 +106,19 @@ export default namespace radio {
       let p1 = taskpool.execute((): NetworkState => {
         return nativeGetNetworkState(slotId);
       })
-      p1.then((content: NullishType) => {
+      p1.then((content: Any) => {
           callback(new BusinessError(), content as NetworkState)
       }, (err: Error): void => {
           callback(err as BusinessError, undefined)
       });
     }
-    
+
     export function getNetworkState(slotId?: int): Promise<NetworkState> {
       return new Promise<NetworkState>((resolve, reject) => {
         let p = taskpool.execute((): NetworkState => {
           return nativeGetNetworkState(slotId);
         })
-        p.then((e: NullishType) => {
+        p.then((e: Any) => {
             let r = e as NetworkState
             resolve(r)
         }).catch((e: Error): void => {
@@ -131,7 +131,7 @@ export default namespace radio {
       let p1 = taskpool.execute((): NetworkState => {
         return nativeGetNetworkState();
       })
-      p1.then((content: NullishType) => {
+      p1.then((content: Any) => {
           callback(new BusinessError(), content as NetworkState)
       }, (err: Error): void => {
           callback(err as BusinessError, undefined)
@@ -281,4 +281,4 @@ export default namespace radio {
     export class NetworkRadioTechInner implements NetworkRadioTech {
       psRadioTech: RadioTechnology;
     }
-}
\ No newline at end of file
+}
diff --git a/frameworks/ets/ani/sim/ets/@ohos.telephony.sim.ets b/frameworks/ets/ani/sim/ets/@ohos.telephony.sim.ets
index edcc84a37..fb81f22d7 100755
--- a/frameworks/ets/ani/sim/ets/@ohos.telephony.sim.ets
+++ b/frameworks/ets/ani/sim/ets/@ohos.telephony.sim.ets
@@ -23,7 +23,7 @@ export default namespace sim {
 
   export function getLockState(slotId: int, lockType: LockType, callback: AsyncCallback<LockState>): void {
     let p1 = taskpool.execute(nativeGetLockState, slotId, lockType)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as LockState);
     }, (err: Error): void => {
         callback(err as BusinessError, LockState.LOCK_OFF);
@@ -33,7 +33,7 @@ export default namespace sim {
   export function getLockState(slotId: int, lockType: LockType): Promise<LockState> {
     return new Promise<LockState>((resolve, reject) => {
       let p = taskpool.execute(nativeGetLockState, slotId, lockType)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as LockState
           resolve(r)
       }).catch((e: Error): void => {
@@ -46,7 +46,7 @@ export default namespace sim {
 
   export function unlockPuk(slotId: int, newPin: string, puk: string, callback: AsyncCallback<LockStatusResponse>): void {
     let p1 = taskpool.execute(nativeUnlockPuk, slotId, newPin, puk)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as LockStatusResponse);
     }, (err: Error): void => {
         callback(err as BusinessError, new LockStatusResponseInner());
@@ -56,7 +56,7 @@ export default namespace sim {
   export function unlockPuk(slotId: int, newPin: string, puk: string): Promise<LockStatusResponse> {
     return new Promise<LockStatusResponse>((resolve, reject) => {
       let p = taskpool.execute(nativeUnlockPuk, slotId, newPin, puk)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as LockStatusResponse
           resolve(r)
       }).catch((e: Error): void => {
@@ -69,7 +69,7 @@ export default namespace sim {
 
   export function unlockPin(slotId: int, pin: string, callback: AsyncCallback<LockStatusResponse>): void {
     let p1 = taskpool.execute(nativeunlockPin, slotId, pin)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as LockStatusResponse);
     }, (err: Error): void => {
         callback(err as BusinessError, new LockStatusResponseInner());
@@ -79,7 +79,7 @@ export default namespace sim {
   export function unlockPin(slotId: int, pin: string): Promise<LockStatusResponse> {
     return new Promise<LockStatusResponse>((resolve, reject) => {
       let p = taskpool.execute(nativeunlockPin, slotId, pin)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as LockStatusResponse
           resolve(r)
       }).catch((e: Error): void => {
@@ -92,7 +92,7 @@ export default namespace sim {
 
   export function getOperatorConfigs(slotId: int, callback: AsyncCallback<Array<OperatorConfig>>): void {
     let p1 = taskpool.execute(nativeGetOperatorConfigs, slotId)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as Array<OperatorConfig>);
     }, (err: Error): void => {
         callback(err as BusinessError, new Array<OperatorConfig>());
@@ -102,7 +102,7 @@ export default namespace sim {
   export function getOperatorConfigs(slotId: int): Promise<Array<OperatorConfig>> {
     return new Promise<Array<OperatorConfig>>((resolve, reject) => {
       let p = taskpool.execute(nativeGetOperatorConfigs, slotId)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as Array<OperatorConfig>
           resolve(r)
       }).catch((e: Error): void => {
@@ -115,7 +115,7 @@ export default namespace sim {
 
   export function getActiveSimAccountInfoList(callback: AsyncCallback<Array<IccAccountInfo>>): void {
     let p1 = taskpool.execute(nativeGetActiveSimAccountInfoList)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as Array<IccAccountInfo>);
     }, (err: Error): void => {
         callback(err as BusinessError, new Array<IccAccountInfo>());
@@ -125,7 +125,7 @@ export default namespace sim {
   export function getActiveSimAccountInfoList(): Promise<Array<IccAccountInfo>> {
     return new Promise<Array<IccAccountInfo>>((resolve, reject) => {
       let p = taskpool.execute(nativeGetActiveSimAccountInfoList)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as Array<IccAccountInfo>
           resolve(r)
       }).catch((e: Error): void => {
@@ -138,7 +138,7 @@ export default namespace sim {
 
   export function getSimAccountInfo(slotId: int, callback: AsyncCallback<IccAccountInfo>): void {
     let p1 = taskpool.execute(nativeGetSimAccountInfo, slotId)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as IccAccountInfo);
     }, (err: Error): void => {
         callback(err as BusinessError, new IccAccountInfoInner);
@@ -148,7 +148,7 @@ export default namespace sim {
   export function getSimAccountInfo(slotId: int): Promise<IccAccountInfo> {
     return new Promise<IccAccountInfo>((resolve, reject) => {
       let p = taskpool.execute(nativeGetSimAccountInfo, slotId)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as IccAccountInfo
           resolve(r)
       }).catch((e: Error): void => {
@@ -161,7 +161,7 @@ export default namespace sim {
 
   export function hasSimCard(slotId: int, callback: AsyncCallback<boolean>): void {
     let p1 = taskpool.execute(nativeHasSimCard, slotId)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as boolean);
     }, (err: Error): void => {
         callback(err as BusinessError, false);
@@ -171,7 +171,7 @@ export default namespace sim {
   export function hasSimCard(slotId: int): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
       let p = taskpool.execute(nativeHasSimCard, slotId)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as boolean
           resolve(r)
       }).catch((e: Error): void => {
@@ -184,7 +184,7 @@ export default namespace sim {
 
   export function getSimState(slotId: int, callback: AsyncCallback<SimState>): void {
     let p1 = taskpool.execute(nativeGetSimState, slotId)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as SimState);
     }, (err: Error): void => {
         callback(err as BusinessError, SimState.SIM_STATE_UNKNOWN);
@@ -194,7 +194,7 @@ export default namespace sim {
   export function getSimState(slotId: int): Promise<SimState> {
     return new Promise<SimState>((resolve, reject) => {
       let p = taskpool.execute(nativeGetSimState, slotId)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as SimState
           resolve(r)
       }).catch((e: Error): void => {
@@ -211,7 +211,7 @@ export default namespace sim {
 
   export function getISOCountryCodeForSim(slotId: int, callback: AsyncCallback<string>): void {
     let p1 = taskpool.execute(nativeGetISOCountryCodeForSim, slotId)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as string);
     }, (err: Error): void => {
         callback(err as BusinessError, new string());
@@ -221,7 +221,7 @@ export default namespace sim {
   export function getISOCountryCodeForSim(slotId: int): Promise<string> {
     return new Promise<string>((resolve, reject) => {
       let p = taskpool.execute(nativeGetISOCountryCodeForSim, slotId)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as string
           resolve(r)
       }).catch((e: Error): void => {
@@ -240,7 +240,7 @@ export default namespace sim {
 
   export function getDefaultVoiceSlotId(callback: AsyncCallback<int>): void {
     let p1 = taskpool.execute(nativeGetDefaultVoiceSlotId)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as int);
     }, (err: Error): void => {
         callback(err as BusinessError, 0);
@@ -250,7 +250,7 @@ export default namespace sim {
   export function getDefaultVoiceSlotId(): Promise<int> {
     return new Promise<int>((resolve, reject) => {
       let p = taskpool.execute(nativeGetDefaultVoiceSlotId)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as int
           resolve(r)
       }).catch((e: Error): void => {
@@ -263,7 +263,7 @@ export default namespace sim {
 
   export function isSimActive(slotId: int, callback: AsyncCallback<boolean>): void {
     let p1 = taskpool.execute(nativeIsSimActive, slotId)
-    p1.then((content: NullishType) => {
+    p1.then((content: Any) => {
         callback(new BusinessError(), content as boolean);
     }, (err: Error): void => {
         callback(err as BusinessError, false);
@@ -273,7 +273,7 @@ export default namespace sim {
   export function isSimActive(slotId: int): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
       let p = taskpool.execute(nativeIsSimActive, slotId)
-      p.then((e: NullishType) => {
+      p.then((e: Any) => {
           let r = e as boolean
           resolve(r)
       }).catch((e: Error): void => {
-- 
Gitee