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

Commit ae4b063b authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ib9d0dd32c1c3c9fbd440abec0ff24eaa8a992dfe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea454bdb 58396078

src/com/android/settings/network/helper/SelectableSubscriptions.java

+2 −1
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ public class SelectableSubscriptions implements Callable<List<SubscriptionAnnota 
    protected List<SubscriptionInfo> getSubInfoList(Context context,

            Function<SubscriptionManager, List<SubscriptionInfo>> convertor) {

        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) {