diff options
author | Uchenna Okoye <uokoye@google.com> | 2021-03-19 16:56:56 -0700 |
---|---|---|
committer | Uchenna Okoye <uokoye@google.com> | 2021-03-20 00:10:01 +0000 |
commit | b91eff8905a3b1479a9d99e401ec992a7a18600e (patch) | |
tree | f1e44e011c698ec18a4516ca047377abb5a9b1b5 | |
parent | 9a750c73e61a8bce30ac83fdc5fc39841f52e8ea (diff) | |
download | Messenger-b91eff8905a3b1479a9d99e401ec992a7a18600e.tar.gz |
Fix Null Pointer Exception when accessing Subscription Info
Bug: 183210926
Test: Resolves NullPointerException
PiperOrigin-RevId: 363998728
Change-Id: I57eb9d3eae420b2fba906470315f2cfbf8f6832e
-rw-r--r-- | src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java | 13 |
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; + } } |