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

Commit 51769c2e authored by SongFerng Wang's avatar SongFerng Wang Committed by Gerrit Code Review
Browse files

Merge "Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE" into main

parents 250101cd f00508c4

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

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