Merge "Clean up unused Lifecycle" into main (adc24bca) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/datausage/DataUsageSummary.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -61,13 +61,6 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage

		// 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 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
		return controllers;
		}
		mSummaryController =
		new DataUsageSummaryPreferenceController(activity, getSettingsLifecycle(), this,
		new DataUsageSummaryPreferenceController(activity, this,
		DataUsageUtils.getDefaultSubscriptionId(activity));
		controllers.add(mSummaryController);
		getSettingsLifecycle().addObserver(mSummaryController);

src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import com.android.settings.datausage.lib.DataUsageLib;
		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 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
		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 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc

		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 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
		DataUsageInfoController dataInfoController,
		NetworkTemplate defaultTemplate,
		Activity activity,
		Lifecycle lifecycle,
		EntityHeaderController entityHeaderController,
		PreferenceFragmentCompat fragment,
		int subscriptionId) {
		@@ -149,7 +145,6 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
		mDataInfoController = dataInfoController;
		mDefaultTemplate = defaultTemplate;
		mHasMobileData = true;
		mLifecycle = lifecycle;
		mEntityHeaderController = entityHeaderController;
		mFragment = fragment;
		mSubId = subscriptionId;

src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.telephony.SubscriptionManager;
		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 @@ import java.util.Set;
		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);
		}

src/com/android/settings/network/telephony/MobileNetworkSettings.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -167,8 +167,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
		});

		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,

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -434,8 +434,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
		mDataUsageSummaryPref.setVisible(true);
		mSummaryHeaderController =
		new WifiDataUsageSummaryPreferenceController(mFragment.getActivity(),
		mLifecycle, (PreferenceFragmentCompat) mFragment,
		mWifiEntry.getWifiConfiguration().getAllNetworkKeys());
		mFragment, mWifiEntry.getWifiConfiguration().getAllNetworkKeys());
		return;
		}