Changing the network type determination order
Even if it is not registered on the network and emergency call is not valid,
IWLAN can be valid if WiFi is available,
so first determine whether WiFi is available and verify the network type.
Test: CtsTelephonyTestCases.android.telephony.cts.TelephonyManagerTest#testNetworkTypeMatchesCellIdentity
Bug: 249693342
Change-Id: Ie2b3726a39f75259059406df69fd8e388f20ab75
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
index 7f9bb9f..ed720aa 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
@@ -1444,6 +1444,14 @@
for (NetworkRegistrationInfo nri : ss.getNetworkRegistrationInfoList()) {
final int networkType = nri.getAccessNetworkTechnology();
final CellIdentity cid = nri.getCellIdentity();
+ if (nri.getTransportType() == AccessNetworkConstants.TRANSPORT_TYPE_WLAN) {
+ assertTrue("NetworkType for WLAN transport must be IWLAN if registered or"
+ + " UNKNOWN if unregistered",
+ networkType == TelephonyManager.NETWORK_TYPE_UNKNOWN
+ || networkType == TelephonyManager.NETWORK_TYPE_IWLAN);
+ assertNull("There is no valid cell type for WLAN", cid);
+ continue;
+ }
if (!nri.isRegistered() && !nri.isEmergencyEnabled()) {
assertEquals(
"Network type cannot be known unless it is providing some service",
@@ -1451,14 +1459,6 @@
assertNull(cid);
continue;
}
- if (nri.getTransportType() == AccessNetworkConstants.TRANSPORT_TYPE_WLAN) {
- assertTrue("NetworkType for WLAN transport must be IWLAN if registered or"
- + " UNKNOWN if unregistered",
- networkType == TelephonyManager.NETWORK_TYPE_UNKNOWN
- || networkType == TelephonyManager.NETWORK_TYPE_IWLAN);
- assertNull("There is no valid cell type for WLAN", cid);
- continue;
- }
assertEquals(nri.getTransportType(), AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
if (nri.isRegistered() || (nri.isEmergencyEnabled() && !nri.isSearching())) {
