1 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java b/src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java
index ab09cbc..b37f5a7 100644
--- a/src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java
+++ b/src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java
@@ -95,7 +95,7 @@ public class UserAccountLiveData extends LiveData<UserAccountChangeList> {
 
     private void loadValue() {
         List<UserAccount> accounts =
-                mSubscriptionManager.getActiveSubscriptionInfoList().stream()
+                getNullSafeSubscriptionInfoList().stream()
                         .map(
                                 it -> {
                                     int subscriptionId = it.getSubscriptionId();
@@ -185,4 +185,15 @@ public class UserAccountLiveData extends LiveData<UserAccountChangeList> {
         }
         return value;
     }
+
+    /** Returns null safe subscription info list */
+    @NonNull
+    private List<SubscriptionInfo> getNullSafeSubscriptionInfoList() {
+        List<SubscriptionInfo> subscriptionInfos =
+                mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (subscriptionInfos == null) {
+            subscriptionInfos = new ArrayList<>();
+        }
+        return subscriptionInfos;
+    }
 }