From f00508c4b5a9f769193a8d5758c17f77a404e309 Mon Sep 17 00:00:00 2001
From: Qiang Chen <quic_cqiang@quicinc.com>
Date: Wed, 11 Dec 2024 13:19:43 +0530
Subject: [PATCH] Add nonNull check for SubscriptionInfoEntity to avoid
 Settings NPE

This NPE can be found in MTBF stress testing

Bug: 290855314
Test: Manaul

Change-Id: I03aaa6618255638a485f32e1bab34c6fa71945e4
---
 src/com/android/settings/network/MobileNetworkRepository.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java
index 8ee5389bfca..c3c97f2de66 100644
--- a/src/com/android/settings/network/MobileNetworkRepository.java
+++ b/src/com/android/settings/network/MobileNetworkRepository.java
@@ -57,6 +57,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -425,6 +426,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
             List<SubscriptionInfoEntity> availableSubInfoEntityList) {
         List<SubscriptionInfoEntity> activeSubInfoEntityList =
                 availableSubInfoEntityList.stream()
+                .filter(entity -> Objects.nonNull(entity))
                 .filter(SubscriptionInfoEntity::isActiveSubscription)
                 .filter(SubscriptionInfoEntity::isSubscriptionVisible)
                 .collect(Collectors.toList());