From eff7ddf3399da5587a15494e1b061e045f8b7d5a Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Sat, 14 Sep 2024 12:43:11 +0800 Subject: [PATCH] Not set subId for Wi-Fi data usage Otherwise the DataUsageList page will be closed since no active sub has id = 0. Bug: 348118234 Flag: EXEMPT bug fix Test: manual - on DataUsageSummary Test: atest DataUsageSummaryTest Change-Id: Ic8387e4fbfe0f0027e87e545be9d7e92ae771136 --- src/com/android/settings/datausage/DataUsageSummary.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index 5681c922c51..dfb35084a12 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -180,14 +180,16 @@ public class DataUsageSummary extends DashboardFragment { void addWifiSection() { TemplatePreferenceCategory category = (TemplatePreferenceCategory) inflatePreferences(R.xml.data_usage_wifi); - category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(), 0); + category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(), + SubscriptionManager.INVALID_SUBSCRIPTION_ID); } private void addEthernetSection() { TemplatePreferenceCategory category = (TemplatePreferenceCategory) inflatePreferences(R.xml.data_usage_ethernet); category.setTemplate( - new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(), 0); + new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(), + SubscriptionManager.INVALID_SUBSCRIPTION_ID); } private Preference inflatePreferences(int resId) {