Clean up unused Lifecycle
From DataUsageSummaryPreferenceController.
Bug: 295260929
Test: m RunSettingsRoboTests
Change-Id: I4f1d33d7878a80e10aae908df32cff052762fd62
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 25fc49b..68473b5 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -61,13 +61,6 @@
// Mobile data keys
public static final String KEY_MOBILE_USAGE_TITLE = "mobile_category";
- public static final String KEY_MOBILE_DATA_USAGE_TOGGLE = "data_usage_enable";
- public static final String KEY_MOBILE_DATA_USAGE = "cellular_data_usage";
- public static final String KEY_MOBILE_BILLING_CYCLE = "billing_preference";
-
- // Wifi keys
- public static final String KEY_WIFI_USAGE_TITLE = "wifi_category";
- public static final String KEY_WIFI_DATA_USAGE = "wifi_data_usage";
private DataUsageSummaryPreference mSummaryPreference;
private DataUsageSummaryPreferenceController mSummaryController;
@@ -161,7 +154,7 @@
return controllers;
}
mSummaryController =
- new DataUsageSummaryPreferenceController(activity, getSettingsLifecycle(), this,
+ new DataUsageSummaryPreferenceController(activity, this,
DataUsageUtils.getDefaultSubscriptionId(activity));
controllers.add(mSummaryController);
getSettingsLifecycle().addObserver(mSummaryController);
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 26b921e..4eb2a71 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -41,7 +41,6 @@
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.network.telephony.TelephonyBasePreferenceController;
import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.net.DataUsageController;
@@ -63,7 +62,6 @@
private static final long PETA = 1000000000000000L;
private EntityHeaderController mEntityHeaderController;
- private final Lifecycle mLifecycle;
private final PreferenceFragmentCompat mFragment;
protected DataUsageController mDataUsageController;
protected DataUsageInfoController mDataInfoController;
@@ -95,11 +93,10 @@
private Future<Long> mHistoricalUsageLevel;
- public DataUsageSummaryPreferenceController(Activity activity,
- Lifecycle lifecycle, PreferenceFragmentCompat fragment, int subscriptionId) {
+ public DataUsageSummaryPreferenceController(
+ Activity activity, PreferenceFragmentCompat fragment, int subscriptionId) {
super(activity, KEY);
- mLifecycle = lifecycle;
mFragment = fragment;
init(subscriptionId);
}
@@ -140,7 +137,6 @@
DataUsageInfoController dataInfoController,
NetworkTemplate defaultTemplate,
Activity activity,
- Lifecycle lifecycle,
EntityHeaderController entityHeaderController,
PreferenceFragmentCompat fragment,
int subscriptionId) {
@@ -149,7 +145,6 @@
mDataInfoController = dataInfoController;
mDefaultTemplate = defaultTemplate;
mHasMobileData = true;
- mLifecycle = lifecycle;
mEntityHeaderController = entityHeaderController;
mFragment = fragment;
mSubId = subscriptionId;
diff --git a/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
index c30dfe3..26a9667 100644
--- a/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
@@ -23,7 +23,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.net.DataUsageController;
import java.util.HashSet;
@@ -35,9 +34,9 @@
public class WifiDataUsageSummaryPreferenceController extends DataUsageSummaryPreferenceController {
final Set<String> mAllNetworkKeys;
- public WifiDataUsageSummaryPreferenceController(Activity activity, Lifecycle lifecycle,
- PreferenceFragmentCompat fragment, Set<String> allNetworkKeys) {
- super(activity, lifecycle, fragment, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ public WifiDataUsageSummaryPreferenceController(
+ Activity activity, PreferenceFragmentCompat fragment, Set<String> allNetworkKeys) {
+ super(activity, fragment, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mAllNetworkKeys = new HashSet<>(allNetworkKeys);
}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 1d862f3..400ddff 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -167,8 +167,7 @@
});
return Arrays.asList(
- new DataUsageSummaryPreferenceController(getActivity(), getSettingsLifecycle(),
- this, mSubId),
+ new DataUsageSummaryPreferenceController(getActivity(), this, mSubId),
new RoamingPreferenceController(context, KEY_ROAMING_PREF, getSettingsLifecycle(),
this, mSubId),
new CallsDefaultSubscriptionController(context, KEY_CALLS_PREF,
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index 6f6e6aa..d54c0d0 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -434,8 +434,7 @@
mDataUsageSummaryPref.setVisible(true);
mSummaryHeaderController =
new WifiDataUsageSummaryPreferenceController(mFragment.getActivity(),
- mLifecycle, (PreferenceFragmentCompat) mFragment,
- mWifiEntry.getWifiConfiguration().getAllNetworkKeys());
+ mFragment, mWifiEntry.getWifiConfiguration().getAllNetworkKeys());
return;
}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
index 0fe59bc..fa8c368 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
@@ -135,7 +135,7 @@
mDataUsageController,
mDataInfoController,
mNetworkTemplate,
- mActivity, null, null, null, mDefaultSubscriptionId));
+ mActivity, null, null, mDefaultSubscriptionId));
doReturn(null).when(mController).getSubscriptionInfo(
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
doReturn(null).when(mController).getSubscriptionPlans(
diff --git a/tests/robotests/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceControllerTest.java
index 4b33344..cb1b890 100644
--- a/tests/robotests/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import androidx.fragment.app.FragmentActivity;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.net.DataUsageController;
import org.junit.Before;
@@ -55,8 +54,6 @@
@Mock
FragmentActivity mActivity;
@Mock
- Lifecycle mLifecycle;
- @Mock
TelephonyManager mTelephonyManager;
@Mock
DataUsageSummaryPreference mSummaryPreference;
@@ -75,7 +72,7 @@
doNothing().when(mSummaryPreference).setWifiMode(anyBoolean(), anyString(), anyBoolean());
doReturn(mDataUsageInfo).when(mDataUsageController).getDataUsageInfo(any());
- mController = spy(new WifiDataUsageSummaryPreferenceController(mActivity, mLifecycle, null,
+ mController = spy(new WifiDataUsageSummaryPreferenceController(mActivity, null,
mAllNetworkKeys));
doReturn(mDataUsageController).when(mController).createDataUsageController(any());
}