diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java index 5e6ee9307a7..a935c18be01 100644 --- a/src/com/android/settings/SettingsDumpService.java +++ b/src/com/android/settings/SettingsDumpService.java @@ -120,7 +120,9 @@ public class SettingsDumpService extends Service { obj.put("cell", array); } if (packageManager.hasSystemFeature(FEATURE_WIFI)) { - obj.put("wifi", dumpDataUsage(NetworkTemplate.buildTemplateWifiWildcard(), controller)); + obj.put("wifi", dumpDataUsage( + NetworkTemplate.buildTemplateWifi( + NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */), controller)); } if (packageManager.hasSystemFeature(FEATURE_ETHERNET)) { diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java index a3ea4784b28..f321d720df4 100644 --- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java @@ -139,7 +139,8 @@ public class AppDataUsagePreferenceController extends AppInfoPreferenceControlle return NetworkTemplate.buildTemplateMobileWildcard(); } if (DataUsageUtils.hasWifiRadio(context)) { - return NetworkTemplate.buildTemplateWifiWildcard(); + return NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */); } return NetworkTemplate.buildTemplateEthernet(); } diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index 9d9bf9c65ae..83b1fb98a5a 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -180,7 +180,9 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage void addWifiSection() { TemplatePreferenceCategory category = (TemplatePreferenceCategory) inflatePreferences(R.xml.data_usage_wifi); - category.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(), 0, services); + category.setTemplate( + NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */), 0, services); } private void addEthernetSection() { diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 93df2f1bcdb..bca1b71cc17 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -224,7 +224,8 @@ public class DataUsageSummaryPreference extends Preference { static void launchWifiDataUsage(Context context) { final Bundle args = new Bundle(1); args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, - NetworkTemplate.buildTemplateWifiWildcard()); + NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */)); args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI); final SubSettingLauncher launcher = new SubSettingLauncher(context) .setArguments(args) @@ -364,7 +365,9 @@ public class DataUsageSummaryPreference extends Preference { @VisibleForTesting long getHistoricalUsageLevel() { final DataUsageController controller = new DataUsageController(getContext()); - return controller.getHistoricalUsageLevel(NetworkTemplate.buildTemplateWifiWildcard()); + return controller.getHistoricalUsageLevel( + NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */)); } } diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index 51f5213a547..f9776f31c23 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java @@ -138,7 +138,8 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc mDefaultTemplate = DataUsageLib.getMobileTemplate(context, subscriptionId); } else if (DataUsageUtils.hasWifiRadio(context)) { mDataUsageTemplate = R.string.wifi_data_template; - mDefaultTemplate = NetworkTemplate.buildTemplateWifiWildcard(); + mDefaultTemplate = NetworkTemplate.buildTemplateWifi( + NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */); } else { mDataUsageTemplate = R.string.ethernet_data_template; mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, subscriptionId); diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java index 7da69cb9352..fae53ecd2e9 100644 --- a/src/com/android/settings/datausage/DataUsageUtils.java +++ b/src/com/android/settings/datausage/DataUsageUtils.java @@ -184,7 +184,8 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU if (SubscriptionManager.isValidSubscriptionId(defaultSubId) && hasMobileData(context)) { return DataUsageLib.getMobileTemplate(context, defaultSubId); } else if (hasWifiRadio(context)) { - return NetworkTemplate.buildTemplateWifiWildcard(); + return NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */); } else { return NetworkTemplate.buildTemplateEthernet(); } diff --git a/src/com/android/settings/datausage/lib/DataUsageLib.java b/src/com/android/settings/datausage/lib/DataUsageLib.java index cf2ce1fcf76..786f0ecee2e 100644 --- a/src/com/android/settings/datausage/lib/DataUsageLib.java +++ b/src/com/android/settings/datausage/lib/DataUsageLib.java @@ -73,6 +73,7 @@ public class DataUsageLib { private static NetworkTemplate getMobileTemplateForSubId( TelephonyManager telephonyManager, int subId) { - return NetworkTemplate.buildTemplateMobileAll(telephonyManager.getSubscriberId(subId)); + return NetworkTemplate.buildTemplateMobileAll( + telephonyManager.getSubscriberId(subId)); } } diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 1ba99a29f26..f2a4abbf7dc 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -272,9 +272,9 @@ public class WifiSettings extends RestrictedSettingsFragment mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager()); mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE); mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext())); - mDataUsagePreference.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(), - 0 /*subId*/, - null /*service*/); + mDataUsagePreference.setTemplate( + NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */), 0 /*subId*/, null /*service*/); } @Override diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java index 8fbe293211e..d791bc20572 100644 --- a/src/com/android/settings/wifi/WifiSettings2.java +++ b/src/com/android/settings/wifi/WifiSettings2.java @@ -249,9 +249,9 @@ public class WifiSettings2 extends RestrictedSettingsFragment mStatusMessagePreference = findPreference(PREF_KEY_STATUS_MESSAGE); mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE); mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext())); - mDataUsagePreference.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(), - 0 /*subId*/, - null /*service*/); + mDataUsagePreference.setTemplate( + NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */), 0 /*subId*/, null /*service*/); } @Override diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index ded7d106ec2..f75b7f030d6 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -18,6 +18,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -309,7 +310,8 @@ public class AppDataUsageTest { ReflectionHelpers.setField(mFragment, "mContext", context); ReflectionHelpers.setField(mFragment, "mAppItem", appItem); ReflectionHelpers.setField(mFragment, "mTemplate", - NetworkTemplate.buildTemplateWifiWildcard()); + NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */)); final long end = System.currentTimeMillis(); final long start = end - (DateUtils.WEEK_IN_MILLIS * 4); @@ -334,7 +336,8 @@ public class AppDataUsageTest { ReflectionHelpers.setField(mFragment, "mContext", context); ReflectionHelpers.setField(mFragment, "mAppItem", appItem); ReflectionHelpers.setField(mFragment, "mTemplate", - NetworkTemplate.buildTemplateWifiWildcard()); + NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */)); final long end = System.currentTimeMillis(); final long start = end - (DateUtils.WEEK_IN_MILLIS * 4); @@ -365,7 +368,8 @@ public class AppDataUsageTest { ReflectionHelpers.setField(mFragment, "mCycles", testCycles); ReflectionHelpers.setField(mFragment, "mAppItem", appItem); ReflectionHelpers.setField(mFragment, "mTemplate", - NetworkTemplate.buildTemplateWifiWildcard()); + NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */)); final NetworkCycleDataForUidLoader loader = (NetworkCycleDataForUidLoader) mFragment.mUidDataCallbacks.onCreateLoader(0 /* id */, Bundle.EMPTY /* args */); @@ -436,6 +440,9 @@ public class AppDataUsageTest { mFragment.onCreate(Bundle.EMPTY); assertThat(mFragment.mTemplate.getMatchRule()) - .isEqualTo(NetworkTemplate.MATCH_WIFI_WILDCARD); + .isEqualTo(NetworkTemplate.MATCH_WIFI); + assertNull(mFragment.mTemplate.getSubscriberId()); + assertThat(mFragment.mTemplate.getNetworkId()) + .isEqualTo(NetworkTemplate.WIFI_NETWORKID_ALL); } } diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java index 6c892019433..747f31c4fd2 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java @@ -78,8 +78,8 @@ public class DataUsageInfoControllerTest { } private NetworkPolicy getDefaultNetworkPolicy() { - NetworkTemplate template = - new NetworkTemplate(NetworkTemplate.MATCH_WIFI_WILDCARD, null, null); + NetworkTemplate template = NetworkTemplate.buildTemplateWifi( + NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */); int cycleDay = -1; String cycleTimezone = "UTC"; long warningBytes = -1; @@ -141,4 +141,4 @@ public class DataUsageInfoControllerTest { mInfoController.updateDataLimit(info, policy); assertThat(info.limitLevel).isEqualTo(policy.limitBytes); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 35e6b1d3104..bfe54a98390 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -511,11 +511,13 @@ public class DataUsageSummaryPreferenceTest { final Bundle expect = new Bundle(1); expect.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, - NetworkTemplate.buildTemplateWifiWildcard()); + NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */)); final Bundle actual = startedIntent .getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS); assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE)) - .isEqualTo(NetworkTemplate.buildTemplateWifiWildcard()); + .isEqualTo(NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, + null /* subscriberId */)); assertThat(startedIntent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0)) .isEqualTo(R.string.wifi_data_usage);