PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: If5614a4e728ea949b8fa07a7c5a90aa506a6093b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
SongFerng Wang
2024-12-19 03:41:41 -08:00
committed by Automerger Merge Worker
parent 3464d757ff 51769c2ed4
commit bb4a442684
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/MobileNetworkRepository.java
View File

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