From e1b9dcc5f089d96ea217d4532b562e31521f7658 Mon Sep 17 00:00:00 2001
From: Yan Yan <evitayan@google.com>
Date: Tue, 15 Aug 2023 22:12:45 +0000
Subject: Add a null pointer check for getSubscriptionsInGroup

Even though #getSubscriptionsInGroup is marked @NonNull, when the
Phone process crashes and this method is called from the system
process, it will return null.

Bug: 295339956
Test: atest CtsVcnTestCases, FrameworksVcnTests
Change-Id: I9f827f9e47efef08e9905c9cc6947df84651383b
---
 services/core/java/com/android/server/VcnManagementService.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java
index c6e9a7d5e2e5..7acca19f9d79 100644
--- a/services/core/java/com/android/server/VcnManagementService.java
+++ b/services/core/java/com/android/server/VcnManagementService.java
@@ -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) {
-- 
cgit v1.2.3-59-g8ed1b