Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99fa55cb authored by Yan Yan's avatar Yan Yan Committed by Gerrit Code Review
Browse files

Merge "Add a null pointer check for getSubscriptionsInGroup" into main

parents a2d740da e1b9dcc5

services/core/java/com/android/server/VcnManagementService.java

+7 −1
Original line number Diff line number Diff line
@@ -456,7 +456,13 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
        final List<SubscriptionInfo> subscriptionInfos = new ArrayList<>();

        Binder.withCleanCallingIdentity(

                () -> {

                    subscriptionInfos.addAll(subMgr.getSubscriptionsInGroup(subscriptionGroup));

                    List<SubscriptionInfo> subsInGroup =

                            subMgr.getSubscriptionsInGroup(subscriptionGroup);

                    if (subsInGroup == null) {

                        logWtf("Received null from getSubscriptionsInGroup");

                        subsInGroup = Collections.emptyList();

                    }

                    subscriptionInfos.addAll(subsInGroup);

                });



        for (SubscriptionInfo info : subscriptionInfos) {