Clean up lifecycle in MobileNetworkSettings
To avoid double registering, which prevent potential issues and could
improve latency.
Since DashboardFragment already supported register lifecycle
automatically for the controllers bound by XML which implements
androidx.lifecycle.Lifecycle, so doing a cleanup to prevent register
lifecycle event manually (doubling).
Bug: 149338098
Test: temporarily add logging to make sure the lifecycle method is
called and only called once
Change-Id: I4dbc36414991ef6b599be61aa77ff0dc8c52468c
diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
index a4ae51b..f4ad478 100644
--- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
+++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
@@ -61,12 +61,9 @@
mCarrierConfigCache = CarrierConfigCache.getInstance(context);
}
- public ContactDiscoveryPreferenceController init(FragmentManager fragmentManager, int subId,
- Lifecycle lifecycle) {
+ void init(FragmentManager fragmentManager, int subId) {
mFragmentManager = fragmentManager;
mSubId = subId;
- lifecycle.addObserver(this);
- return this;
}
@Override
diff --git a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
index 2bbb1ca..099e01f 100644
--- a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
+++ b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
@@ -25,7 +25,6 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
-import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
@@ -52,10 +51,9 @@
super(context, preferenceKey);
}
- public void init(Lifecycle lifecycle, int subId) {
+ void init(int subId) {
this.mSubId = subId;
mManager = mContext.getSystemService(TelephonyManager.class).createForSubscriptionId(subId);
- lifecycle.addObserver(this);
}
@OnLifecycleEvent(ON_RESUME)
diff --git a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
index a3a281c..342b579 100644
--- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
@@ -28,7 +28,6 @@
import android.telephony.SubscriptionManager;
import android.view.View;
-import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.ListPreference;
@@ -72,10 +71,6 @@
== View.LAYOUT_DIRECTION_RTL;
}
- public void init(Lifecycle lifecycle) {
- lifecycle.addObserver(this);
- }
-
/** @return SubscriptionInfo for the default subscription for the service, or null if there
* isn't one. */
protected abstract SubscriptionInfo getDefaultSubscriptionInfo();
diff --git a/src/com/android/settings/network/telephony/DisabledSubscriptionController.java b/src/com/android/settings/network/telephony/DisabledSubscriptionController.java
index b5febdd..6c62286 100644
--- a/src/com/android/settings/network/telephony/DisabledSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/DisabledSubscriptionController.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.telephony.SubscriptionManager;
-import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceCategory;
@@ -53,8 +52,7 @@
/**
* Re-initialize the configuration based on subscription id provided
*/
- public void init(Lifecycle lifecycle, int subId) {
- lifecycle.addObserver(this);
+ public void init(int subId) {
mSubId = subId;
}
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 658c6c6..43b3cc0 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -28,7 +28,6 @@
import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.ListPreference;
@@ -163,7 +162,7 @@
return false;
}
- public void init(Lifecycle lifecycle, int subId) {
+ void init(int subId) {
mSubId = subId;
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
@@ -178,7 +177,6 @@
updatePreference();
});
}
- lifecycle.addObserver(this);
}
private void updatePreference() {
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 4eb8a85..94b6aaf 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -176,14 +176,12 @@
if (dataUsageSummaryPreferenceController != null) {
dataUsageSummaryPreferenceController.init(mSubId);
}
- use(CallsDefaultSubscriptionController.class).init(getLifecycle());
- use(SmsDefaultSubscriptionController.class).init(getLifecycle());
- use(MobileNetworkSwitchController.class).init(getLifecycle(), mSubId);
+ use(MobileNetworkSwitchController.class).init(mSubId);
use(CarrierSettingsVersionPreferenceController.class).init(mSubId);
use(BillingCyclePreferenceController.class).init(mSubId);
use(MmsMessagePreferenceController.class).init(mSubId);
- use(DataDuringCallsPreferenceController.class).init(getLifecycle(), mSubId);
- use(DisabledSubscriptionController.class).init(getLifecycle(), mSubId);
+ use(DataDuringCallsPreferenceController.class).init(mSubId);
+ use(DisabledSubscriptionController.class).init(mSubId);
use(DeleteSimProfilePreferenceController.class).init(mSubId, this,
REQUEST_CODE_DELETE_SUBSCRIPTION);
use(DisableSimFooterPreferenceController.class).init(mSubId);
@@ -197,7 +195,7 @@
use(CarrierPreferenceController.class).init(mSubId);
use(DataUsagePreferenceController.class).init(mSubId);
use(PreferredNetworkModePreferenceController.class).init(mSubId);
- use(EnabledNetworkModePreferenceController.class).init(getLifecycle(), mSubId);
+ use(EnabledNetworkModePreferenceController.class).init(mSubId);
use(DataServiceSetupPreferenceController.class).init(mSubId);
use(Enable2gPreferenceController.class).init(mSubId);
use(CarrierWifiTogglePreferenceController.class).init(getLifecycle(), mSubId);
@@ -206,12 +204,12 @@
use(WifiCallingPreferenceController.class).init(mSubId);
final OpenNetworkSelectPagePreferenceController openNetworkSelectPagePreferenceController =
- use(OpenNetworkSelectPagePreferenceController.class).init(getLifecycle(), mSubId);
+ use(OpenNetworkSelectPagePreferenceController.class).init(mSubId);
final AutoSelectPreferenceController autoSelectPreferenceController =
use(AutoSelectPreferenceController.class)
- .init(getLifecycle(), mSubId)
+ .init(mSubId)
.addListener(openNetworkSelectPagePreferenceController);
- use(NetworkPreferenceCategoryController.class).init(getLifecycle(), mSubId)
+ use(NetworkPreferenceCategoryController.class).init(mSubId)
.setChildren(Arrays.asList(autoSelectPreferenceController));
mCdmaSystemSelectPreferenceController = use(CdmaSystemSelectPreferenceController.class);
mCdmaSystemSelectPreferenceController.init(getPreferenceManager(), mSubId);
@@ -231,8 +229,7 @@
.addListener(videoCallingPreferenceController);
use(Enhanced4gAdvancedCallingPreferenceController.class).init(mSubId)
.addListener(videoCallingPreferenceController);
- use(ContactDiscoveryPreferenceController.class).init(getParentFragmentManager(), mSubId,
- getLifecycle());
+ use(ContactDiscoveryPreferenceController.class).init(getParentFragmentManager(), mSubId);
use(NrAdvancedCallingPreferenceController.class).init(mSubId);
}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
index 42fa95e..5014634 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
@@ -23,7 +23,6 @@
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
-import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
@@ -49,8 +48,7 @@
mChangeListener = new SubscriptionsChangeListener(context, this);
}
- public void init(Lifecycle lifecycle, int subId) {
- lifecycle.addObserver(this);
+ void init(int subId) {
mSubId = subId;
}
diff --git a/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java b/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java
index 4ebcb7a..ed14616 100644
--- a/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java
+++ b/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.telephony.SubscriptionManager;
-import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
@@ -69,10 +68,9 @@
mPreferenceScreen = screen;
}
- public NetworkPreferenceCategoryController init(Lifecycle lifecycle, int subId) {
+ NetworkPreferenceCategoryController init(int subId) {
mSubId = subId;
- lifecycle.addObserver(this);
return this;
}
}
diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
index ed8dc24..a19702f 100644
--- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
@@ -34,7 +34,6 @@
import android.telephony.TelephonyManager;
import androidx.annotation.VisibleForTesting;
-import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
@@ -206,7 +205,10 @@
});
}
- public AutoSelectPreferenceController init(Lifecycle lifecycle, int subId) {
+ /**
+ * Initialization based on given subscription id.
+ **/
+ public AutoSelectPreferenceController init(int subId) {
mSubId = subId;
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
@@ -217,7 +219,6 @@
CarrierConfigManager.KEY_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL)
: false;
- lifecycle.addObserver(this);
return this;
}
diff --git a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
index 4c5dd95..8462228 100644
--- a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
@@ -26,7 +26,6 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
-import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
@@ -118,11 +117,13 @@
}
}
- public OpenNetworkSelectPagePreferenceController init(Lifecycle lifecycle, int subId) {
+ /**
+ * Initialization based on given subscription id.
+ **/
+ public OpenNetworkSelectPagePreferenceController init(int subId) {
mSubId = subId;
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
- lifecycle.addObserver(this);
return this;
}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java
index b3725fa..de3d2b2 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java
@@ -105,7 +105,8 @@
"ContactDiscovery");
// Ensure subscriptionInfo check doesn't fail.
SubscriptionUtil.setAvailableSubscriptionsForTesting(Collections.emptyList());
- mPreferenceControllerUT.init(mFragmentManager, TEST_SUB_ID, mLifecycle);
+ mPreferenceControllerUT.init(mFragmentManager, TEST_SUB_ID);
+ mLifecycle.addObserver(mPreferenceControllerUT);
mSwitchPreferenceUT = spy(new SwitchPreference(mContext));
mSwitchPreferenceUT.setKey(mPreferenceControllerUT.getPreferenceKey());
mPreferenceControllerUT.preference = mSwitchPreferenceUT;
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataDuringCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataDuringCallsPreferenceControllerTest.java
index 62d9974..4a53aa2 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DataDuringCallsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/DataDuringCallsPreferenceControllerTest.java
@@ -32,12 +32,9 @@
import android.content.Context;
import android.telephony.TelephonyManager;
-import androidx.lifecycle.Lifecycle;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
-import com.android.settings.network.telephony.DataDuringCallsPreferenceController;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,8 +55,6 @@
@Mock
private TelephonyManager mTelephonyManager;
@Mock
- private Lifecycle mLifecycle;
- @Mock
private PreferenceScreen mPreferenceScreen;
private Context mContext;
@@ -78,7 +73,7 @@
@Override
protected boolean hasMobileData() { return true; }
};
- mController.init(mLifecycle, SUB_ID_1);
+ mController.init(SUB_ID_1);
}
@Test
diff --git a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
index c945206..4b99646 100644
--- a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
@@ -111,7 +111,7 @@
mController = new EnabledNetworkModePreferenceController(mContext, KEY);
mockAllowedNetworkTypes(ALLOWED_ALL_NETWORK_TYPE);
mockAccessFamily(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
mPreference.setKey(mController.getPreferenceKey());
}
@@ -205,7 +205,7 @@
public void updateState_5gWorldPhone_GlobalHasNr() {
mockAllowedNetworkTypes(ALLOWED_ALL_NETWORK_TYPE);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
mController.updateState(mPreference);
@@ -221,7 +221,7 @@
mockAllowedNetworkTypes(ALLOWED_ALL_NETWORK_TYPE);
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
// NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA = NR | LTE | RAF_TD_SCDMA | GSM | WCDMA
when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -241,7 +241,7 @@
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
// NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA = NR | LTE | RAF_TD_SCDMA | GSM | WCDMA
when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -261,7 +261,7 @@
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
// NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA = NR | LTE | RAF_TD_SCDMA | GSM | WCDMA
when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -281,7 +281,7 @@
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
// NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = LTE | CDMA | EVDO | GSM | WCDMA
when(mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -304,7 +304,7 @@
public void updateState_GlobalDisAllowed5g_GlobalWithoutNR() {
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
// NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA = NR | LTE | CDMA | EVDO | GSM | WCDMA
@@ -324,7 +324,7 @@
public void updateState_GlobalDisAllowed5g_SelectOnGlobal() {
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
// NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA = NR | LTE | CDMA | EVDO | GSM | WCDMA
diff --git a/tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
index b269660..9f52c4c 100644
--- a/tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
@@ -32,8 +32,6 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -48,8 +46,6 @@
@Mock
private SubscriptionManager mSubscriptionManager;
- @Mock
- private Lifecycle mLifecycle;
private PreferenceScreen mScreen;
private PreferenceManager mPreferenceManager;
@@ -72,7 +68,7 @@
mScreen.addPreference(mCategory);
mController = new DisabledSubscriptionController(mContext, KEY);
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
}
@Test
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java
index 23c9531..e460d67 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java
@@ -48,7 +48,6 @@
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.widget.SettingsMainSwitchPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.After;
import org.junit.Before;
@@ -67,8 +66,6 @@
private SubscriptionManager mSubscriptionManager;
@Mock
private SubscriptionInfo mSubscription;
- @Mock
- private Lifecycle mLifecycle;
private PreferenceScreen mScreen;
private PreferenceManager mPreferenceManager;
@@ -94,7 +91,7 @@
final String key = "prefKey";
mController = new MobileNetworkSwitchController(mContext, key);
- mController.init(mLifecycle, mSubscription.getSubscriptionId());
+ mController.init(mSubscription.getSubscriptionId());
if (Looper.myLooper() == null) {
Looper.prepare();
diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
index 1e165d7..292b4a9 100644
--- a/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
@@ -31,7 +31,6 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
-import androidx.lifecycle.Lifecycle;
import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -62,8 +61,6 @@
private CarrierConfigCache mCarrierConfigCache;
@Mock
private ProgressDialog mProgressDialog;
- @Mock
- private Lifecycle mLifecycle;
private PersistableBundle mCarrierConfig;
private AutoSelectPreferenceController mController;
@@ -91,7 +88,7 @@
mController = new AutoSelectPreferenceController(mContext, "auto_select");
mController.mProgressDialog = mProgressDialog;
mController.mSwitchPreference = mSwitchPreference;
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
}
@Test
@@ -139,6 +136,6 @@
when(mCarrierConfigCache.getConfigForSubId(SUB_ID)).thenReturn(null);
// Should not crash
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
}
}
diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
index 53ae1b9..b4d49b2 100644
--- a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
-import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -59,8 +58,6 @@
private ServiceState mServiceState;
@Mock
private SubscriptionInfo mSubscriptionInfo;
- @Mock
- private Lifecycle mLifecycle;
private PersistableBundle mCarrierConfig;
private OpenNetworkSelectPagePreferenceController mController;
@@ -99,7 +96,7 @@
super.updateState(mPreference);
}
};
- mController.init(mLifecycle, SUB_ID);
+ mController.init(SUB_ID);
}
@Test