commit 547a62d3e7763639c2fdd09f1caa3561b4907f51
author anitalin <anitalin@microsoft.com> Tue Jul 13 14:22:14 2021 +0800
committer Jack Yu <jackyu@google.com> Mon Nov 15 23:56:46 2021 +0000
tree ec18d745d4444e8cfbe7fa5deb205cddf2590497
parent ec9d113103376f8e0f925ad87ec9a007a24284e4

Fix CTS: getActiveSubscriptionInfoList and getSubscriptionsInGroup no permission

getActiveSubscriptionInfoList skip carrier privilege permission to get correct subinfo(e-Sim+p-Sim)
getSubscriptionsInGroup didn't have permission

Bug: 193475184
Bug: 205599406
Test: cts
Signed-off-by: anitalin <anitalin@microsoft.com>
Merged-In: I1ee857d9e080475d36100775ada660778f2a50ae
Change-Id: I1ee857d9e080475d36100775ada660778f2a50ae
(cherry picked from commit bbf87f0f5d0d32ff2c68e30405a742e45f48c84b)

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 bc813aa..b6ee78c 100644
--- a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
+++ b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
@@ -1086,7 +1086,8 @@
         try {
             // Get all active subscriptions.
             List<SubscriptionInfo> activeSubInfos =
-                    mSubscriptionManager.getActiveSubscriptionInfoList();
+                    ShellIdentityUtils.invokeMethodWithShellPermissions(mSubscriptionManager,
+                    (sm) -> sm.getActiveSubscriptionInfoList());
 
             List<Integer> activeSubGroup = getSubscriptionIdList(activeSubInfos);
             activeSubGroup.removeIf(id -> id == subId);
@@ -1262,13 +1263,17 @@
     }
 
     private void removeSubscriptionsFromGroup(ParcelUuid uuid) {
-        List<SubscriptionInfo> infoList = mSubscriptionManager.getSubscriptionsInGroup(uuid);
+        List<SubscriptionInfo> infoList = ShellIdentityUtils.invokeMethodWithShellPermissions(
+                mSubscriptionManager,
+                (sm) -> (sm.getSubscriptionsInGroup(uuid)));
         if (!infoList.isEmpty()) {
             List<Integer> subscriptionIdList = getSubscriptionIdList(infoList);
             ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mSubscriptionManager,
                     (sm) -> sm.removeSubscriptionsFromGroup(subscriptionIdList, uuid));
         }
-        infoList = mSubscriptionManager.getSubscriptionsInGroup(uuid);
+        infoList = ShellIdentityUtils.invokeMethodWithShellPermissions(
+                mSubscriptionManager,
+                (sm) -> (sm.getSubscriptionsInGroup(uuid)));
         assertThat(infoList).isEmpty();
     }