PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix unit test problems in MobileNetworkSummaryController"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-08 23:20:29 +00:00
committed by Android (Google) Code Review
parent 0962a4615f 8b26dd27e8
commit 2feea46860
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/MobileNetworkSummaryController.java
View File

@@ -29,6 +29,7 @@ import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccManager; import android.telephony.euicc.EuiccManager;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.telephony.MobileNetworkActivity; import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settings.widget.AddPreference; import com.android.settings.widget.AddPreference;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
@@ -43,7 +44,8 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
public class MobileNetworkSummaryController extends AbstractPreferenceController implements public class MobileNetworkSummaryController extends AbstractPreferenceController implements
SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver { SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver,
PreferenceControllerMixin {
private static final String TAG = "MobileNetSummaryCtlr"; private static final String TAG = "MobileNetSummaryCtlr";
private static final String KEY = "mobile_network_list"; private static final String KEY = "mobile_network_list";
@@ -74,9 +76,11 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
mSubscriptionManager = context.getSystemService(SubscriptionManager.class); mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
mTelephonyMgr = mContext.getSystemService(TelephonyManager.class); mTelephonyMgr = mContext.getSystemService(TelephonyManager.class);
mEuiccManager = mContext.getSystemService(EuiccManager.class); mEuiccManager = mContext.getSystemService(EuiccManager.class);
if (lifecycle != null) {
mChangeListener = new SubscriptionsChangeListener(context, this); mChangeListener = new SubscriptionsChangeListener(context, this);
lifecycle.addObserver(this); lifecycle.addObserver(this);
} }
}
@OnLifecycleEvent(ON_RESUME) @OnLifecycleEvent(ON_RESUME)
public void onResume() { public void onResume() {