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

Commit 2feea468 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix unit test problems in MobileNetworkSummaryController"

parents 0962a461 8b26dd27

src/com/android/settings/network/MobileNetworkSummaryController.java

+7 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.telephony.TelephonyManager; 
import android.telephony.euicc.EuiccManager;



import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.network.telephony.MobileNetworkActivity;

import com.android.settings.widget.AddPreference;

import com.android.settingslib.Utils;
@@ -43,7 +44,8 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;



public class MobileNetworkSummaryController extends AbstractPreferenceController implements

        SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver {

        SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver,

        PreferenceControllerMixin {

    private static final String TAG = "MobileNetSummaryCtlr";



    private static final String KEY = "mobile_network_list";
@@ -74,9 +76,11 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController 
        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);

        mTelephonyMgr = mContext.getSystemService(TelephonyManager.class);

        mEuiccManager = mContext.getSystemService(EuiccManager.class);

        if (lifecycle != null) {

          mChangeListener = new SubscriptionsChangeListener(context, this);

          lifecycle.addObserver(this);

        }

    }



    @OnLifecycleEvent(ON_RESUME)

    public void onResume() {