Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26128e87 authored by lesl's avatar lesl
Browse files

wifi: Use new API for wifi data usage function 

For wifi, a old API: buildTemplateWifiWildcard will includes the merged
wifi which is included to mobile usage. It should not double count
again. Call new API: buildTemplateWifi with
NetworkId: NetworkTemplate.WIFI_NETWORKID_ALL
and null subscriberId to get non-merged wifi usage.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsageTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageInfoControllerTest
Test: Manual Test, wifi data usage count correctly.
Bug: 176396812
Change-Id: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
parent f2ec0fbf

src/com/android/settings/SettingsDumpService.java

+3 −1
Original line number Diff line number Diff line
@@ -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)) {

src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -183,7 +183,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() {

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

+5 −2
Original line number Diff line number Diff line
@@ -225,7 +225,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)
@@ -367,7 +368,9 @@ public class DataUsageSummaryPreference extends Preference { 
    @VisibleForTesting

    protected long getHistoricalUsageLevel() {

        final DataUsageController controller = new DataUsageController(getContext());

        return controller.getHistoricalUsageLevel(NetworkTemplate.buildTemplateWifiWildcard());

        return controller.getHistoricalUsageLevel(

                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,

                null /* subscriberId */));

    }



    @VisibleForTesting

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

+2 −1
Original line number Diff line number Diff line
@@ -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);