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

Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev am: 5839607867

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

Change-Id: Ib9d0dd32c1c3c9fbd440abec0ff24eaa8a992dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bonian Chen
2022-04-08 08:28:14 +00:00
committed by Automerger Merge Worker
parent ea454bdbcd 5839607867
commit ae4b063bc2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/helper/SelectableSubscriptions.java
View File

@@ -141,7 +141,8 @@ public class SelectableSubscriptions implements Callable<List<SubscriptionAnnota
protected List<SubscriptionInfo> getSubInfoList(Context context, protected List<SubscriptionInfo> getSubInfoList(Context context,
Function<SubscriptionManager, List<SubscriptionInfo>> convertor) { Function<SubscriptionManager, List<SubscriptionInfo>> convertor) {
SubscriptionManager subManager = getSubscriptionManager(context); SubscriptionManager subManager = getSubscriptionManager(context);
return (subManager == null) ? Collections.emptyList() : convertor.apply(subManager); List<SubscriptionInfo> result = (subManager == null) ? null : convertor.apply(subManager);
return (result == null) ? Collections.emptyList() : result;
} }
protected SubscriptionManager getSubscriptionManager(Context context) { protected SubscriptionManager getSubscriptionManager(Context context) {