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

Commit f38761e0 authored by Les Lee's avatar Les Lee Committed by Automerger Merge Worker
Browse files

Merge "wifi: Use new API for wifi data usage function" am: 7469890c 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759

Change-Id: Id4c98842b11cb4102059fdbbe76d5c4b527302fe
parents 220ba051 7469890c

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
@@ -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() {

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

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

    }



}

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);