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

Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE

Browse Source 
This NPE can be found in MTBF stress testing

Bug: 290855314
Test: Manaul

Change-Id: I03aaa6618255638a485f32e1bab34c6fa71945e4
This commit is contained in:
Qiang Chen
2024-12-11 13:19:43 +05:30
parent e0e07dab27
commit f00508c4b5
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

@@ -57,6 +57,7 @@ import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@@ -425,6 +426,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
List<SubscriptionInfoEntity> availableSubInfoEntityList) { List<SubscriptionInfoEntity> availableSubInfoEntityList) {
List<SubscriptionInfoEntity> activeSubInfoEntityList = List<SubscriptionInfoEntity> activeSubInfoEntityList =
availableSubInfoEntityList.stream() availableSubInfoEntityList.stream()
.filter(entity -> Objects.nonNull(entity))
.filter(SubscriptionInfoEntity::isActiveSubscription) .filter(SubscriptionInfoEntity::isActiveSubscription)
.filter(SubscriptionInfoEntity::isSubscriptionVisible) .filter(SubscriptionInfoEntity::isSubscriptionVisible)
.collect(Collectors.toList()); .collect(Collectors.toList());