commit 2648058f1326df06da3265e6a20ec43ee89af55d
author Rambo Wang <rambowang@google.com> Tue Jun 07 20:46:00 2022 +0000
committer Rambo Wang <rambowang@google.com> Tue Jun 07 20:46:00 2022 +0000
tree 84cd110f950d1ad8ed1ab349fe891f40de725694
parent cfa01b6b21cd0f2eb385c5ac79331fce01f3c48f

Use default sub instead of dafault data sub in CarrierApiTest

When the test device has non-CTS SIM profile which has default data, the
sub get from getDefaultDataSub may lead to the non-CTS SIM, causing
some cases fail.

Switch to default sub which is more likely to fall into CTS pSIM
sub to make the CarrierApiTest more robust.

Bug: 232344389
Test: atest CtsCarrierApiTestCases
Change-Id: Ie8551ca43f8fdefa4515067de5ef893d63e94c75

tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java

diff --git a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
index e4fbee6..bdba6a6 100644
--- a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
+++ b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
@@ -1105,7 +1105,7 @@
         }
 
         // Set subscription group with current sub Id.
-        int subId = SubscriptionManager.getDefaultDataSubscriptionId();
+        int subId = SubscriptionManager.getDefaultSubscriptionId();
         if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) return;
         ParcelUuid uuid = ShellIdentityUtils.invokeMethodWithShellPermissions(mSubscriptionManager,
                 (sm) -> sm.createSubscriptionGroup(Arrays.asList(subId)));
@@ -1142,7 +1142,7 @@
     @Test
     public void testAddSubscriptionToExistingGroupForEsim() {
         // Set subscription group with current sub Id.
-        int subId = SubscriptionManager.getDefaultDataSubscriptionId();
+        int subId = SubscriptionManager.getDefaultSubscriptionId();
         if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) return;
         ParcelUuid uuid = mSubscriptionManager.createSubscriptionGroup(Arrays.asList(subId));
 
@@ -1172,7 +1172,7 @@
      */
     @Test
     public void testOpportunistic() {
-        int subId = SubscriptionManager.getDefaultDataSubscriptionId();
+        int subId = SubscriptionManager.getDefaultSubscriptionId();
         if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) return;
         SubscriptionInfo info = mSubscriptionManager.getActiveSubscriptionInfo(subId);
         boolean oldOpportunistic = info.isOpportunistic();