diff --git a/src/com/android/settings/network/helper/SelectableSubscriptions.java b/src/com/android/settings/network/helper/SelectableSubscriptions.java index 45d842b29b9..8e8f405e1fb 100644 --- a/src/com/android/settings/network/helper/SelectableSubscriptions.java +++ b/src/com/android/settings/network/helper/SelectableSubscriptions.java @@ -141,7 +141,8 @@ public class SelectableSubscriptions implements Callable getSubInfoList(Context context, Function> convertor) { SubscriptionManager subManager = getSubscriptionManager(context); - return (subManager == null) ? Collections.emptyList() : convertor.apply(subManager); + List result = (subManager == null) ? null : convertor.apply(subManager); + return (result == null) ? Collections.emptyList() : result; } protected SubscriptionManager getSubscriptionManager(Context context) {