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

Commit c39acee1 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Clean up NetworkServices from setTemplate 

Not used any more.

Bug: 290856342
Test: manual - on mobile settings
Test: m RunSettingsRoboTests
Test: unit test
Change-Id: I9c8dde2a8812e83e535d15713ccbf25b42f1f303
parent ba1ec910

src/com/android/settings/datausage/BillingCyclePreference.kt

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.util.AttributeSet 
import androidx.preference.Preference

import com.android.settings.R

import com.android.settings.core.SubSettingLauncher

import com.android.settings.datausage.TemplatePreference.NetworkServices

import com.android.settings.datausage.lib.BillingCycleRepository

import com.android.settings.network.MobileDataEnabledListener
@@ -45,7 +44,7 @@ class BillingCyclePreference @JvmOverloads constructor( 
        updateEnabled()

    }



    override fun setTemplate(template: NetworkTemplate, subId: Int, services: NetworkServices?) {

    override fun setTemplate(template: NetworkTemplate, subId: Int) {

        this.template = template

        this.subId = subId

        summary = null

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class BillingCyclePreferenceController extends BasePreferenceController { 


        NetworkTemplate template = DataUsageLib.getMobileTemplate(mContext, mSubscriptionId);



        preference.setTemplate(template, mSubscriptionId, null);

        preference.setTemplate(template, mSubscriptionId);

    }



    @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class CellDataPreference extends CustomDialogPreferenceCompat 
    }



    @Override

    public void setTemplate(NetworkTemplate template, int subId, NetworkServices services) {

    public void setTemplate(NetworkTemplate template, int subId) {

        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            throw new IllegalArgumentException("CellDataPreference needs a SubscriptionInfo");

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc 
    }



    @Override

    public void setTemplate(NetworkTemplate template, int subId, NetworkServices services) {

    public void setTemplate(NetworkTemplate template, int subId) {

        mTemplate = template;

        mSubId = subId;

        final DataUsageController controller = getDataUsageController();

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

+9 −11
Original line number Diff line number Diff line
@@ -183,9 +183,8 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage 
    private void addMobileSection(int subId, SubscriptionInfo subInfo) {

        TemplatePreferenceCategory category = (TemplatePreferenceCategory)

                inflatePreferences(R.xml.data_usage_cellular);

        category.setTemplate(DataUsageLib.getMobileTemplate(getContext(), subId),

                subId, services);

        category.pushTemplates(services);

        category.setTemplate(DataUsageLib.getMobileTemplate(getContext(), subId), subId);

        category.pushTemplates();

        final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(

                subInfo, getContext());

        if (subInfo != null && !TextUtils.isEmpty(displayName)) {
@@ -198,15 +197,14 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage 
    void addWifiSection() {

        TemplatePreferenceCategory category = (TemplatePreferenceCategory)

                inflatePreferences(R.xml.data_usage_wifi);

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

                0, services);

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

    }



    private void addEthernetSection() {

        TemplatePreferenceCategory category = (TemplatePreferenceCategory)

                inflatePreferences(R.xml.data_usage_ethernet);

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

                0, services);

        category.setTemplate(

                new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(), 0);

    }



    private Preference inflatePreferences(int resId) {
@@ -261,7 +259,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage 
        for (int i = 1; i < screen.getPreferenceCount(); i++) {

            Preference currentPreference = screen.getPreference(i);

            if (currentPreference instanceof TemplatePreferenceCategory) {

            ((TemplatePreferenceCategory) currentPreference).pushTemplates(services);

                ((TemplatePreferenceCategory) currentPreference).pushTemplates();

            }

        }

    }