diff options
| author | 2023-08-21 23:25:43 +0000 | |
|---|---|---|
| committer | 2023-08-21 23:25:43 +0000 | |
| commit | c4cf88ba785c9f5efce52f0a946b251a8b7c04d2 (patch) | |
| tree | bc9876e6b6ce2ca77791d181f66385bad424ee0a | |
| parent | aac338f9ac348abb122f660b807799450309d743 (diff) | |
| parent | 12d2dfbddb649b24b74f4a91e1acb47c6e3a7b17 (diff) | |
Merge "Add a null pointer check for getSubscriptionsInGroup" into main am: 99fa55cbd3 am: 12d2dfbddb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2712254
Change-Id: If9e46488d9313dc787bddc2849d3feea1be4db9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/VcnManagementService.java | 8 |
1 files changed, 7 insertions, 1 deletions
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) { |