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

Commit 039cdfd7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750 

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

Change-Id: I763f17465055f64f42093fac721e06ac2c81b286
parents d7b3c851 0ccb8750

src/com/android/settings/SettingsDumpService.java

+6 −11
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.telephony.TelephonyManager; 
import androidx.annotation.VisibleForTesting;



import com.android.settings.applications.ProcStatsData;

import com.android.settings.datausage.lib.DataUsageLib;

import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService;

import com.android.settingslib.net.DataUsageController;
@@ -109,14 +110,8 @@ public class SettingsDumpService extends Service { 
        if (telephonyManager.isDataCapable()) {

            JSONArray array = new JSONArray();

            for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) {

                telephonyManager = telephonyManager

                        .createForSubscriptionId(info.getSubscriptionId());

                String subscriberId = telephonyManager.getSubscriberId();

                // The null subscriberId means that no any mobile/carrier network will be matched.

                // Using old API: buildTemplateMobileAll for the null subscriberId to avoid NPE.

                NetworkTemplate template = subscriberId != null

                        ? NetworkTemplate.buildTemplateCarrierMetered(subscriberId)

                        : NetworkTemplate.buildTemplateMobileAll(subscriberId);

                NetworkTemplate template = DataUsageLib.getMobileTemplateForSubId(

                        telephonyManager, info.getSubscriptionId());

                final JSONObject usage = dumpDataUsage(template, controller);

                usage.put("subId", info.getSubscriptionId());

                array.put(usage);
@@ -125,12 +120,12 @@ public class SettingsDumpService extends Service { 
        }

        if (packageManager.hasSystemFeature(FEATURE_WIFI)) {

            obj.put("wifi", dumpDataUsage(

                    NetworkTemplate.buildTemplateWifi(

                    NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */), controller));

                    new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(), controller));

        }



        if (packageManager.hasSystemFeature(FEATURE_ETHERNET)) {

            obj.put("ethernet", dumpDataUsage(NetworkTemplate.buildTemplateEthernet(), controller));

            obj.put("ethernet", dumpDataUsage(new NetworkTemplate.Builder(

                    NetworkTemplate.MATCH_ETHERNET).build(), controller));

        }

        return obj;

    }

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

+5 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.applications.appinfo;



import android.content.Context;

import android.net.NetworkStats;

import android.net.NetworkTemplate;

import android.os.Bundle;

import android.text.format.DateUtils;
@@ -136,13 +137,13 @@ public class AppDataUsagePreferenceController extends AppInfoPreferenceControlle 


    private static NetworkTemplate getTemplate(Context context) {

        if (DataUsageUtils.hasReadyMobileRadio(context)) {

            return NetworkTemplate.buildTemplateMobileWildcard();

            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE).setMeteredness(

                    NetworkStats.METERED_YES).build();

        }

        if (DataUsageUtils.hasWifiRadio(context)) {

            return NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,

                    null /* subscriberId */);

            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();

        }

        return NetworkTemplate.buildTemplateEthernet();

        return new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build();

    }



    @VisibleForTesting

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

+4 −4
Original line number Diff line number Diff line
@@ -183,15 +183,15 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage 
    void addWifiSection() {

        TemplatePreferenceCategory category = (TemplatePreferenceCategory)

                inflatePreferences(R.xml.data_usage_wifi);

        category.setTemplate(

                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,

                null /* subscriberId */), 0, services);

        category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(),

                0, services);

    }



    private void addEthernetSection() {

        TemplatePreferenceCategory category = (TemplatePreferenceCategory)

                inflatePreferences(R.xml.data_usage_ethernet);

        category.setTemplate(NetworkTemplate.buildTemplateEthernet(), 0, services);

        category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(),

                0, services);

    }



    private Preference inflatePreferences(int resId) {

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

+2 −4
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ public class DataUsageSummaryPreference extends Preference { 
    static void launchWifiDataUsage(Context context) {

        final Bundle args = new Bundle(1);

        args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,

                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,

                null /* subscriberId */));

                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());

        args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI);

        final SubSettingLauncher launcher = new SubSettingLauncher(context)

                .setArguments(args)
@@ -369,8 +368,7 @@ public class DataUsageSummaryPreference extends Preference { 
    protected long getHistoricalUsageLevel() {

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

        return controller.getHistoricalUsageLevel(

                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,

                null /* subscriberId */));

                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());

    }



    @VisibleForTesting

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

+1 −2
Original line number Diff line number Diff line
@@ -138,8 +138,7 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc 
            mDefaultTemplate = DataUsageLib.getMobileTemplate(context, subscriptionId);

        } else if (DataUsageUtils.hasWifiRadio(context)) {

            mDataUsageTemplate = R.string.wifi_data_template;

            mDefaultTemplate = NetworkTemplate.buildTemplateWifi(

                    NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */);

            mDefaultTemplate = new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();

        } else {

            mDataUsageTemplate = R.string.ethernet_data_template;

            mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, subscriptionId);