From d9663b78225c382c8d1b442b8fa077d25279ae7e Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Fri, 5 Oct 2018 14:22:07 -0700 Subject: [PATCH] Fix typo in getHistoriclUsageLevel() Bug: 111751694 Test: make RunSettingsRoboTests Change-Id: I523e43f60948e49e78d518a4eeb3ed2bf885f7bd --- src/com/android/settings/datausage/DataUsagePreference.java | 5 ++--- src/com/android/settings/datausage/DataUsageSummary.java | 3 +-- .../settings/datausage/DataUsageSummaryPreference.java | 6 +++--- .../android/settings/datausage/DataUsagePreferenceTest.java | 4 ++-- .../settings/datausage/DataUsageSummaryPreferenceTest.java | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java index 5bd8dcd08d3..aa4e646bdb5 100644 --- a/src/com/android/settings/datausage/DataUsagePreference.java +++ b/src/com/android/settings/datausage/DataUsagePreference.java @@ -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 { diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index c7c906ffb95..97715db0f63 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -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); diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 5b54ebb7878..92d3e29c317 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -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()); } } diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java index 422450a9d40..151bc7dfa83 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java @@ -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 */); diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 8964d889771..121d9a25540 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -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();