commit 8f44cd65f9247d559feda6368d292f1c51dd6300
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 28 05:38:43 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 28 05:38:43 2023 +0000
tree 9742b89205066ef1987d5754b658bae499a0db11
parent 89c79d5582e1292c8a32cea6e9556a674c8ec127
parent 6e12115617b14cd514ea2a62d2ab268f129164e6

Merge "Fix NPE in CtsSimPhoneBookTestCases"

tests/tests/simphonebookprovider/src/android/provider/cts/simphonebook/RemovableSims.java

diff --git a/tests/tests/simphonebookprovider/src/android/provider/cts/simphonebook/RemovableSims.java b/tests/tests/simphonebookprovider/src/android/provider/cts/simphonebook/RemovableSims.java
index d012eb6..b6bedf0 100644
--- a/tests/tests/simphonebookprovider/src/android/provider/cts/simphonebook/RemovableSims.java
+++ b/tests/tests/simphonebookprovider/src/android/provider/cts/simphonebook/RemovableSims.java
@@ -71,6 +71,9 @@
         List<SubscriptionInfo> allSubscriptions = SystemUtil.runWithShellPermissionIdentity(() ->
                         subscriptionManager.getActiveSubscriptionInfoList(),
                 Manifest.permission.READ_PHONE_STATE);
+        if (allSubscriptions == null) {
+            allSubscriptions = Collections.emptyList();
+        }
         Map<Integer, List<SubscriptionInfo>> subscriptionsByCardId = allSubscriptions.stream()
                 .collect(Collectors.groupingBy(SubscriptionInfo::getCardId));
         for (UiccCardInfo cardInfo : uiccCards) {