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

Clean up unused Lifecycle

Browse Source 
From DataUsageSummaryPreferenceController.

Bug: 295260929
Test: m RunSettingsRoboTests
Change-Id: I4f1d33d7878a80e10aae908df32cff052762fd62
This commit is contained in:
Chaohui Wang
2023-08-22 14:21:03 +08:00
parent e7377fc73c
commit cdbe5f350d
7 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -61,13 +61,6 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
// Mobile data keys // Mobile data keys
public static final String KEY_MOBILE_USAGE_TITLE = "mobile_category"; 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 DataUsageSummaryPreference mSummaryPreference;
private DataUsageSummaryPreferenceController mSummaryController; private DataUsageSummaryPreferenceController mSummaryController;
@@ -161,7 +154,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
return controllers; return controllers;
} }
mSummaryController = mSummaryController =
new DataUsageSummaryPreferenceController(activity, getSettingsLifecycle(), this, new DataUsageSummaryPreferenceController(activity, this,
DataUsageUtils.getDefaultSubscriptionId(activity)); DataUsageUtils.getDefaultSubscriptionId(activity));
controllers.add(mSummaryController); controllers.add(mSummaryController);
getSettingsLifecycle().addObserver(mSummaryController); getSettingsLifecycle().addObserver(mSummaryController);

9
src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
View File

@@ -41,7 +41,6 @@ import com.android.settings.datausage.lib.DataUsageLib;
import com.android.settings.network.ProxySubscriptionManager; import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.network.telephony.TelephonyBasePreferenceController; import com.android.settings.network.telephony.TelephonyBasePreferenceController;
import com.android.settings.widget.EntityHeaderController; 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.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.net.DataUsageController; import com.android.settingslib.net.DataUsageController;
@@ -63,7 +62,6 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
private static final long PETA = 1000000000000000L; private static final long PETA = 1000000000000000L;
private EntityHeaderController mEntityHeaderController; private EntityHeaderController mEntityHeaderController;
private final Lifecycle mLifecycle;
private final PreferenceFragmentCompat mFragment; private final PreferenceFragmentCompat mFragment;
protected DataUsageController mDataUsageController; protected DataUsageController mDataUsageController;
protected DataUsageInfoController mDataInfoController; protected DataUsageInfoController mDataInfoController;
@@ -95,11 +93,10 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
private Future<Long> mHistoricalUsageLevel; private Future<Long> mHistoricalUsageLevel;
public DataUsageSummaryPreferenceController(Activity activity, public DataUsageSummaryPreferenceController(
Lifecycle lifecycle, PreferenceFragmentCompat fragment, int subscriptionId) { Activity activity, PreferenceFragmentCompat fragment, int subscriptionId) {
super(activity, KEY); super(activity, KEY);
mLifecycle = lifecycle;
mFragment = fragment; mFragment = fragment;
init(subscriptionId); init(subscriptionId);
} }
@@ -140,7 +137,6 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
DataUsageInfoController dataInfoController, DataUsageInfoController dataInfoController,
NetworkTemplate defaultTemplate, NetworkTemplate defaultTemplate,
Activity activity, Activity activity,
Lifecycle lifecycle,
EntityHeaderController entityHeaderController, EntityHeaderController entityHeaderController,
PreferenceFragmentCompat fragment, PreferenceFragmentCompat fragment,
int subscriptionId) { int subscriptionId) {
@@ -149,7 +145,6 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
mDataInfoController = dataInfoController; mDataInfoController = dataInfoController;
mDefaultTemplate = defaultTemplate; mDefaultTemplate = defaultTemplate;
mHasMobileData = true; mHasMobileData = true;
mLifecycle = lifecycle;
mEntityHeaderController = entityHeaderController; mEntityHeaderController = entityHeaderController;
mFragment = fragment; mFragment = fragment;
mSubId = subscriptionId; mSubId = subscriptionId;

7
src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
View File

@@ -23,7 +23,6 @@ import android.telephony.SubscriptionManager;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.net.DataUsageController; import com.android.settingslib.net.DataUsageController;
import java.util.HashSet; import java.util.HashSet;
@@ -35,9 +34,9 @@ import java.util.Set;
public class WifiDataUsageSummaryPreferenceController extends DataUsageSummaryPreferenceController { public class WifiDataUsageSummaryPreferenceController extends DataUsageSummaryPreferenceController {
final Set<String> mAllNetworkKeys; final Set<String> mAllNetworkKeys;
public WifiDataUsageSummaryPreferenceController(Activity activity, Lifecycle lifecycle, public WifiDataUsageSummaryPreferenceController(
PreferenceFragmentCompat fragment, Set<String> allNetworkKeys) { Activity activity, PreferenceFragmentCompat fragment, Set<String> allNetworkKeys) {
super(activity, lifecycle, fragment, SubscriptionManager.INVALID_SUBSCRIPTION_ID); super(activity, fragment, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mAllNetworkKeys = new HashSet<>(allNetworkKeys); mAllNetworkKeys = new HashSet<>(allNetworkKeys);
} }

3
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -167,8 +167,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
}); });
return Arrays.asList( return Arrays.asList(
new DataUsageSummaryPreferenceController(getActivity(), getSettingsLifecycle(), new DataUsageSummaryPreferenceController(getActivity(), this, mSubId),
this, mSubId),
new RoamingPreferenceController(context, KEY_ROAMING_PREF, getSettingsLifecycle(), new RoamingPreferenceController(context, KEY_ROAMING_PREF, getSettingsLifecycle(),
this, mSubId), this, mSubId),
new CallsDefaultSubscriptionController(context, KEY_CALLS_PREF, new CallsDefaultSubscriptionController(context, KEY_CALLS_PREF,

3
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

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

2
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
View File

@@ -135,7 +135,7 @@ public class DataUsageSummaryPreferenceControllerTest {
mDataUsageController, mDataUsageController,
mDataInfoController, mDataInfoController,
mNetworkTemplate, mNetworkTemplate,
mActivity, null, null, null, mDefaultSubscriptionId)); mActivity, null, null, mDefaultSubscriptionId));
doReturn(null).when(mController).getSubscriptionInfo( doReturn(null).when(mController).getSubscriptionInfo(
SubscriptionManager.INVALID_SUBSCRIPTION_ID); SubscriptionManager.INVALID_SUBSCRIPTION_ID);
doReturn(null).when(mController).getSubscriptionPlans( doReturn(null).when(mController).getSubscriptionPlans(

5
tests/robotests/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceControllerTest.java
View File

@@ -29,7 +29,6 @@ import android.telephony.TelephonyManager;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.net.DataUsageController; import com.android.settingslib.net.DataUsageController;
import org.junit.Before; import org.junit.Before;
@@ -55,8 +54,6 @@ public class WifiDataUsageSummaryPreferenceControllerTest {
@Mock @Mock
FragmentActivity mActivity; FragmentActivity mActivity;
@Mock @Mock
Lifecycle mLifecycle;
@Mock
TelephonyManager mTelephonyManager; TelephonyManager mTelephonyManager;
@Mock @Mock
DataUsageSummaryPreference mSummaryPreference; DataUsageSummaryPreference mSummaryPreference;
@@ -75,7 +72,7 @@ public class WifiDataUsageSummaryPreferenceControllerTest {
doNothing().when(mSummaryPreference).setWifiMode(anyBoolean(), anyString(), anyBoolean()); doNothing().when(mSummaryPreference).setWifiMode(anyBoolean(), anyString(), anyBoolean());
doReturn(mDataUsageInfo).when(mDataUsageController).getDataUsageInfo(any()); doReturn(mDataUsageInfo).when(mDataUsageController).getDataUsageInfo(any());
mController = spy(new WifiDataUsageSummaryPreferenceController(mActivity, mLifecycle, null, mController = spy(new WifiDataUsageSummaryPreferenceController(mActivity, null,
mAllNetworkKeys)); mAllNetworkKeys));
doReturn(mDataUsageController).when(mController).createDataUsageController(any()); doReturn(mDataUsageController).when(mController).createDataUsageController(any());
} }