From 84012c30549d0759929776e4303adc2ec7ee6943 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Tue, 29 Mar 2022 09:04:27 +0000
Subject: [PATCH] [Settings] Add null pointer protection for Subscription API

Avoid from Settings app crash when having null pointer returned from SubscriptionManager API.

Bug: 226042289
Change-Id: I69ad2c7244f86220a61fb8fa9de2b556dbcec5a0
Test: local
---
 .../settings/network/helper/SelectableSubscriptions.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/helper/SelectableSubscriptions.java b/src/com/android/settings/network/helper/SelectableSubscriptions.java
index 45d842b29b9..8e8f405e1fb 100644
--- a/src/com/android/settings/network/helper/SelectableSubscriptions.java
+++ b/src/com/android/settings/network/helper/SelectableSubscriptions.java
@@ -141,7 +141,8 @@ public class SelectableSubscriptions implements Callable<List<SubscriptionAnnota
     protected List<SubscriptionInfo> getSubInfoList(Context context,
             Function<SubscriptionManager, List<SubscriptionInfo>> convertor) {
         SubscriptionManager subManager = getSubscriptionManager(context);
-        return (subManager == null) ? Collections.emptyList() : convertor.apply(subManager);
+        List<SubscriptionInfo> result = (subManager == null) ? null : convertor.apply(subManager);
+        return (result == null) ? Collections.emptyList() : result;
     }
 
     protected SubscriptionManager getSubscriptionManager(Context context) {