diff options
| author | 2023-08-22 00:00:48 +0000 | |
|---|---|---|
| committer | 2023-08-22 00:00:48 +0000 | |
| commit | 5aa50bbce9fc1a469aa60fd3cc4367beb0aa8929 (patch) | |
| tree | 1bd14d51c24cea815778bfa7eeff5f05ede281c2 | |
| parent | 68158102766db066f874485b2ff81582d76e1d06 (diff) | |
| parent | c4cf88ba785c9f5efce52f0a946b251a8b7c04d2 (diff) | |
Merge "Add a null pointer check for getSubscriptionsInGroup" into main am: 99fa55cbd3 am: 12d2dfbddb am: c4cf88ba78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2712254
Change-Id: Ie70b3abbca684ba6c51e30ae54f0f44f1c4e9c51
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) { |