summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/datausage
diff options
context:
space:
mode:
authorBonian Chen <bonianchen@google.com>2020-04-24 11:33:15 +0800
committerBonian Chen <bonianchen@google.com>2020-04-24 11:35:44 +0800
commit87a457747273909463efaa7ea67cc94fa6b120c9 (patch)
tree746a326eb170a736da7021ab7127f342507b59ad /src/com/android/settings/datausage
parenta26a7afe8e54995ad35e49cad4f17a1bbe53082a (diff)
downloadpackages_apps_Settings-87a457747273909463efaa7ea67cc94fa6b120c9.tar.gz
packages_apps_Settings-87a457747273909463efaa7ea67cc94fa6b120c9.tar.bz2
packages_apps_Settings-87a457747273909463efaa7ea67cc94fa6b120c9.zip
[Settings] Support re-init DataUsageSummaryPreferenceController
Support re-init DataUsageSummaryPreferenceController without re-constructing it. Bug: 151751844 Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest Change-Id: If72a521c5fbaec8b8902fb80b13d9d0f07c716af
Diffstat (limited to 'src/com/android/settings/datausage')
-rw-r--r--src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 648b38c7e8..239ad2178e 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -114,25 +114,30 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
*/
public void init(int subscriptionId) {
mSubId = subscriptionId;
+ mDataUsageController = null;
+ }
- mDefaultTemplate = DataUsageUtils.getDefaultTemplate(mContext, mSubId);
+ private void updateConfiguration(Context context,
+ int subscriptionId, SubscriptionInfo subInfo) {
final NetworkPolicyManager policyManager =
- mContext.getSystemService(NetworkPolicyManager.class);
+ context.getSystemService(NetworkPolicyManager.class);
mPolicyEditor = new NetworkPolicyEditor(policyManager);
- mHasMobileData = DataUsageUtils.hasMobileData(mContext);
+ mHasMobileData = DataUsageUtils.hasMobileData(context);
- mDataUsageController = new DataUsageController(mContext);
- mDataUsageController.setSubscriptionId(mSubId);
+ mDataUsageController = new DataUsageController(context);
+ mDataUsageController.setSubscriptionId(subscriptionId);
mDataInfoController = new DataUsageInfoController();
- final SubscriptionInfo subInfo = getSubscriptionInfo(mSubId);
if (subInfo != null) {
mDataUsageTemplate = R.string.cell_data_template;
- } else if (DataUsageUtils.hasWifiRadio(mContext)) {
+ mDefaultTemplate = DataUsageUtils.getMobileTemplate(context, subscriptionId);
+ } else if (DataUsageUtils.hasWifiRadio(context)) {
mDataUsageTemplate = R.string.wifi_data_template;
+ mDefaultTemplate = NetworkTemplate.buildTemplateWifiWildcard();
} else {
mDataUsageTemplate = R.string.ethernet_data_template;
+ mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, subscriptionId);
}
}
@@ -198,8 +203,8 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
DataUsageSummaryPreference summaryPreference = (DataUsageSummaryPreference) preference;
final SubscriptionInfo subInfo = getSubscriptionInfo(mSubId);
- if (subInfo == null) {
- mDefaultTemplate = NetworkTemplate.buildTemplateWifiWildcard();
+ if (mDataUsageController == null) {
+ updateConfiguration(mContext, mSubId, subInfo);
}
final DataUsageController.DataUsageInfo info =