Check for CDMA in set roaming/subscription mode
Only set CDMA roaming and subscription mode on CDMA devices. Also fixed
bug in reset state.
Test: atest TelephonyManagerTest
Bug: 176139895
Change-Id: I53243cc77d8e6b0aab776af60bac0c136330a062
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 ab3c97d..bd34a17 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
@@ -3212,7 +3212,8 @@
@Test
public void testCdmaRoamingMode() {
- if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+ if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+ || mTelephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_CDMA) {
return;
}
@@ -3238,7 +3239,8 @@
@Test
public void testCdmaSubscriptionMode() {
- if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+ if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+ || mTelephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_CDMA) {
return;
}
@@ -3259,7 +3261,7 @@
// Reset state
ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mTelephonyManager,
- tm -> tm.setCdmaRoamingMode(cdmaSubscriptionMode));
+ tm -> tm.setCdmaSubscriptionMode(cdmaSubscriptionMode));
}
@Test
