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

Commit 8dc7d371 authored by Ling Ma's avatar Ling Ma
Browse files

Fix NPE

There could be a rare race condition where getDefaultDataSubscriptionInfo become null during the evaluatin.

Bug: 299242849
Test: manual
Change-Id: I5765bc8fac5362d16aa0976e1f870f91f0de4c2c
parent 1bb84f98
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -265,9 +265,8 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl

    /**@return {@code true} if subId is the default data sub. **/
    private boolean isDds(int subId) {
        return mSubscriptionManager.getDefaultDataSubscriptionInfo() != null
                && mSubscriptionManager.getDefaultDataSubscriptionInfo().getSubscriptionId()
                == subId;
        SubscriptionInfo info = mSubscriptionManager.getDefaultDataSubscriptionInfo();
        return info != null && info.getSubscriptionId() == subId;
    }

    private CharSequence getMobilePreferenceSummary(int subId) {