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

Commit 5aa50bbc authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Add a null pointer check for getSubscriptionsInGroup" into main am:... 

Merge "Add a null pointer check for getSubscriptionsInGroup" into main am: 99fa55cb am: 12d2dfbd am: c4cf88ba

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2712254



Change-Id: Ie70b3abbca684ba6c51e30ae54f0f44f1c4e9c51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68158102 c4cf88ba

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) {