Removed more CDMA codes
Removed more CDMA related codes and dead codes.
Test: Basic telephony functionality tests
Test: atest FrameworksTelephonyTests
Bug: 423974654
Flag: EXEMPT flag removal
Change-Id: Ia6cd2337c7c82f154b6c6305888fb72537ade3ea
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/ServiceStateTest.java b/tests/tests/telephony/current/src/android/telephony/cts/ServiceStateTest.java
index 99c653b..b53a9c2 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/ServiceStateTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/ServiceStateTest.java
@@ -56,8 +56,6 @@
private static final String OPERATOR_ALPHA_LONG = "CtsOperatorLong";
private static final String OPERATOR_ALPHA_SHORT = "CtsOp";
private static final String OPERATOR_NUMERIC = "02871";
- private static final int SYSTEM_ID = 123;
- private static final int NETWORK_ID = 456;
private static final int CHANNEL_NUMBER_BAND_66 = 66436;
private static final int CHANNEL_NUMBER_BAND_33 = 36000;
private static final int[] CELL_BANDWIDTH = {1, 2, 3};
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyRegistryManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyRegistryManagerTest.java
index cbc06e8..85940ff 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyRegistryManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyRegistryManagerTest.java
@@ -14,8 +14,10 @@
import android.platform.test.annotations.RequiresFlagsEnabled;
import android.platform.test.flag.junit.CheckFlagsRule;
import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+import android.telephony.AccessNetworkConstants;
import android.telephony.CallAttributes;
import android.telephony.CallState;
+import android.telephony.NetworkRegistrationInfo;
import android.telephony.PhoneStateListener;
import android.telephony.PreciseCallState;
import android.telephony.ServiceState;
@@ -202,7 +204,16 @@
Log.d(TAG, "initialResult: " + initialResult);
ServiceState dummyState = new ServiceState();
- dummyState.setCdmaSystemAndNetworkId(1234, 5678);
+
+ dummyState.setVoiceRegState(ServiceState.STATE_IN_SERVICE);
+ NetworkRegistrationInfo nri =
+ new NetworkRegistrationInfo.Builder()
+ .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
+ .setDomain(NetworkRegistrationInfo.DOMAIN_CS)
+ .setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_UMTS)
+ .build();
+ dummyState.addNetworkRegistrationInfo(nri);
+
ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mTelephonyRegistryMgr,
(trm) -> trm.notifyServiceStateChanged(
SubscriptionManager.getSlotIndex(
