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

Commit d9663b78 authored by Doris Ling's avatar Doris Ling
Browse files

Fix typo in getHistoriclUsageLevel() 

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I523e43f60948e49e78d518a4eeb3ed2bf885f7bd
parent 3c5850ee

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

+2 −3
Original line number Diff line number Diff line
@@ -51,8 +51,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, NetworkServices services) {

        mTemplate = template;

        mSubId = subId;

        final DataUsageController controller = getDataUsageController();
@@ -66,7 +65,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc 
                    DataUsageUtils.formatDataUsage(getContext(), usageInfo.usageLevel),

                    usageInfo.period));

        }

        final long usageLevel = controller.getHistoriclUsageLevel(template);

        final long usageLevel = controller.getHistoricalUsageLevel(template);

        if (usageLevel > 0L) {

            setIntent(getIntent());

        } else {

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

+1 −2
Original line number Diff line number Diff line
@@ -283,8 +283,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage 
                                    formatUsedData()));

                } else {

                    final DataUsageController.DataUsageInfo info =

                            mDataController

                                    .getDataUsageInfo(NetworkTemplate.buildTemplateWifiWildcard());

                            mDataController.getWifiDataUsageInfo();



                    if (info == null) {

                        mSummaryLoader.setSummary(this, null);

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

+3 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class DataUsageSummaryPreference extends Preference { 
            carrierInfo.setVisibility(View.GONE);

            limitInfo.setVisibility(View.GONE);



            final long usageLevel = getHistoriclUsageLevel();

            final long usageLevel = getHistoricalUsageLevel();

            if (usageLevel > 0L) {

                launchButton.setOnClickListener((view) -> {

                    launchWifiDataUsage(getContext());
@@ -339,9 +339,9 @@ public class DataUsageSummaryPreference extends Preference { 
    }



    @VisibleForTesting

    long getHistoriclUsageLevel() {

    long getHistoricalUsageLevel() {

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

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

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

    }



}

tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class DataUsagePreferenceTest { 


    @Test

    public void setTemplate_noDataUsage_shouldDisablePreference() {

        doReturn(0L).when(mController).getHistoriclUsageLevel(any(NetworkTemplate.class));

        doReturn(0L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));



        mPreference.setTemplate(

                NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);
@@ -68,7 +68,7 @@ public class DataUsagePreferenceTest { 


    @Test

    public void setTemplate_hasDataUsage_shouldNotDisablePreference() {

        doReturn(200L).when(mController).getHistoriclUsageLevel(any(NetworkTemplate.class));

        doReturn(200L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));



        mPreference.setTemplate(

                NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);

tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ public class DataUsageSummaryPreferenceTest { 
        mSummaryPreference.setUsageNumbers(1000000L, -1L, true);

        final String cycleText = "The quick fox";

        mSummaryPreference.setWifiMode(true, cycleText);

        doReturn(200L).when(mSummaryPreference).getHistoriclUsageLevel();

        doReturn(200L).when(mSummaryPreference).getHistoricalUsageLevel();



        bindViewHolder();

        assertThat(mUsageTitle.getText().toString())
@@ -529,7 +529,7 @@ public class DataUsageSummaryPreferenceTest { 
    public void testSetWifiMode_noUsageInfo_shouldDisableLaunchButton() {

        mSummaryPreference = spy(mSummaryPreference);

        mSummaryPreference.setWifiMode(true, "Test cycle text");

        doReturn(0L).when(mSummaryPreference).getHistoriclUsageLevel();

        doReturn(0L).when(mSummaryPreference).getHistoricalUsageLevel();



        bindViewHolder();