Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f00508c4 authored by Qiang Chen's avatar Qiang Chen
Browse files

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
parent e0e07dab

src/com/android/settings/network/MobileNetworkRepository.java

+2 −0
Original line number Diff line number Diff line
@@ -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());