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

Commit 99e03458 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev

parents 7bf4c8f9 fa0bdabc
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils;

import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -232,13 +232,12 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon
        mSubscriptionInfoEntityList.forEach(entity -> {
            if (entity.getSubId() == mSubId) {
                mSubscriptionInfoEntity = entity;
                if (entity.getSubId() == SubscriptionManager.getDefaultDataSubscriptionId()) {
                    mDefaultSubId = entity.getSubId();
                }
        });
        int subId = mSubscriptionInfoEntity.getSubId();
        if (mSubscriptionInfoEntity != null
                && subId == SubscriptionManager.getDefaultDataSubscriptionId()) {
            mDefaultSubId = subId;
            }
        });

        update();
        refreshSummary(mPreference);
    }
+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEA

import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;