diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java index a4ae51bf93d..f4ad478d383 100644 --- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java +++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java @@ -61,12 +61,9 @@ public class ContactDiscoveryPreferenceController extends TelephonyTogglePrefere 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 2bbb1cab049..099e01f9057 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.os.Looper; 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 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen 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 a3a281c4198..342b5793853 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.SubscriptionInfo; 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 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere == 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 b5febdd18a7..6c6228686a7 100644 --- a/src/com/android/settings/network/telephony/DisabledSubscriptionController.java +++ b/src/com/android/settings/network/telephony/DisabledSubscriptionController.java @@ -22,7 +22,6 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; 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 @@ public class DisabledSubscriptionController extends TelephonyBasePreferenceContr /** * 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 658c6c6ba22..43b3cc0e4c4 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.telephony.TelephonyManager; 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 @@ public class EnabledNetworkModePreferenceController extends 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 @@ public class EnabledNetworkModePreferenceController extends 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 4eb8a857232..94b6aaf1bcc 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -176,14 +176,12 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { 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 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { 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 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { 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 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { .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 42fa95ecd99..50146343299 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.content.Context; 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 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl 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 4ebcb7a59d6..ed14616940c 100644 --- a/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java +++ b/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java @@ -22,7 +22,6 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; 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 @@ public class NetworkPreferenceCategoryController extends PreferenceCategoryContr 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 ed8dc24063e..a19702fcb06 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.SubscriptionManager; 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 class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon }); } - 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 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon 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 4c5dd953453..8462228febd 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.ServiceState; 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 class OpenNetworkSelectPagePreferenceController extends } } - 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 b3725fa6c18..de3d2b27425 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 @@ public class ContactDiscoveryPreferenceControllerTest { "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 62d9974c59e..4a53aa25349 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 static org.mockito.Mockito.when; 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 @@ public class DataDuringCallsPreferenceControllerTest { @Mock private TelephonyManager mTelephonyManager; @Mock - private Lifecycle mLifecycle; - @Mock private PreferenceScreen mPreferenceScreen; private Context mContext; @@ -78,7 +73,7 @@ public class DataDuringCallsPreferenceControllerTest { @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 c9452063a95..4b996465dfb 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 @@ public class EnabledNetworkModePreferenceControllerTest { 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 class EnabledNetworkModePreferenceControllerTest { 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 @@ public class EnabledNetworkModePreferenceControllerTest { 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 @@ public class EnabledNetworkModePreferenceControllerTest { 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 @@ public class EnabledNetworkModePreferenceControllerTest { 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 @@ public class EnabledNetworkModePreferenceControllerTest { 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 class EnabledNetworkModePreferenceControllerTest { 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 class EnabledNetworkModePreferenceControllerTest { 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 b2696600bad..9f52c4cf9b0 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.preference.PreferenceScreen; 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 @@ public class DisabledSubscriptionControllerTest { @Mock private SubscriptionManager mSubscriptionManager; - @Mock - private Lifecycle mLifecycle; private PreferenceScreen mScreen; private PreferenceManager mPreferenceManager; @@ -72,7 +68,7 @@ public class DisabledSubscriptionControllerTest { 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 23c9531fcc4..e460d675de9 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 androidx.test.ext.junit.runners.AndroidJUnit4; 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 @@ public class MobileNetworkSwitchControllerTest { private SubscriptionManager mSubscriptionManager; @Mock private SubscriptionInfo mSubscription; - @Mock - private Lifecycle mLifecycle; private PreferenceScreen mScreen; private PreferenceManager mPreferenceManager; @@ -94,7 +91,7 @@ public class MobileNetworkSwitchControllerTest { 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 1e165d7a5a4..292b4a9ae5c 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.CarrierConfigManager; 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 @@ public class AutoSelectPreferenceControllerTest { private CarrierConfigCache mCarrierConfigCache; @Mock private ProgressDialog mProgressDialog; - @Mock - private Lifecycle mLifecycle; private PersistableBundle mCarrierConfig; private AutoSelectPreferenceController mController; @@ -91,7 +88,7 @@ public class AutoSelectPreferenceControllerTest { 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 @@ public class AutoSelectPreferenceControllerTest { 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 53ae1b9eb53..b4d49b2a838 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.SubscriptionInfo; 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 @@ public class OpenNetworkSelectPagePreferenceControllerTest { private ServiceState mServiceState; @Mock private SubscriptionInfo mSubscriptionInfo; - @Mock - private Lifecycle mLifecycle; private PersistableBundle mCarrierConfig; private OpenNetworkSelectPagePreferenceController mController; @@ -99,7 +96,7 @@ public class OpenNetworkSelectPagePreferenceControllerTest { super.updateState(mPreference); } }; - mController.init(mLifecycle, SUB_ID); + mController.init(SUB_ID); } @Test