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

Commit bb4a4426 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE" into main am: 51769c2e 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3405179



Change-Id: If5614a4e728ea949b8fa07a7c5a90aa506a6093b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3464d757 51769c2e

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());