PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo in getHistoriclUsageLevel()

Browse Source 
Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I523e43f60948e49e78d518a4eeb3ed2bf885f7bd
This commit is contained in:
Doris Ling
2018-10-05 14:22:07 -07:00
parent 3c5850ee62
commit d9663b7822
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/DataUsagePreference.java
View File

@@ -51,8 +51,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
} }
@Override @Override
public void setTemplate(NetworkTemplate template, int subId, public void setTemplate(NetworkTemplate template, int subId, NetworkServices services) {
NetworkServices services) {
mTemplate = template; mTemplate = template;
mSubId = subId; mSubId = subId;
final DataUsageController controller = getDataUsageController(); final DataUsageController controller = getDataUsageController();
@@ -66,7 +65,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
DataUsageUtils.formatDataUsage(getContext(), usageInfo.usageLevel), DataUsageUtils.formatDataUsage(getContext(), usageInfo.usageLevel),
usageInfo.period)); usageInfo.period));
} }
final long usageLevel = controller.getHistoriclUsageLevel(template); final long usageLevel = controller.getHistoricalUsageLevel(template);
if (usageLevel > 0L) { if (usageLevel > 0L) {
setIntent(getIntent()); setIntent(getIntent());
} else { } else {

3
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -283,8 +283,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
formatUsedData())); formatUsedData()));
} else { } else {
final DataUsageController.DataUsageInfo info = final DataUsageController.DataUsageInfo info =
mDataController mDataController.getWifiDataUsageInfo();
.getDataUsageInfo(NetworkTemplate.buildTemplateWifiWildcard());
if (info == null) { if (info == null) {
mSummaryLoader.setSummary(this, null); mSummaryLoader.setSummary(this, null);

6
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -178,7 +178,7 @@ public class DataUsageSummaryPreference extends Preference {
carrierInfo.setVisibility(View.GONE); carrierInfo.setVisibility(View.GONE);
limitInfo.setVisibility(View.GONE); limitInfo.setVisibility(View.GONE);
final long usageLevel = getHistoriclUsageLevel(); final long usageLevel = getHistoricalUsageLevel();
if (usageLevel > 0L) { if (usageLevel > 0L) {
launchButton.setOnClickListener((view) -> { launchButton.setOnClickListener((view) -> {
launchWifiDataUsage(getContext()); launchWifiDataUsage(getContext());
@@ -339,9 +339,9 @@ public class DataUsageSummaryPreference extends Preference {
} }
@VisibleForTesting @VisibleForTesting
long getHistoriclUsageLevel() { long getHistoricalUsageLevel() {
final DataUsageController controller = new DataUsageController(getContext()); final DataUsageController controller = new DataUsageController(getContext());
return controller.getHistoriclUsageLevel(NetworkTemplate.buildTemplateWifiWildcard()); return controller.getHistoricalUsageLevel(NetworkTemplate.buildTemplateWifiWildcard());
} }
} }

4
tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
View File

@@ -57,7 +57,7 @@ public class DataUsagePreferenceTest {
@Test @Test
public void setTemplate_noDataUsage_shouldDisablePreference() { public void setTemplate_noDataUsage_shouldDisablePreference() {
doReturn(0L).when(mController).getHistoriclUsageLevel(any(NetworkTemplate.class)); doReturn(0L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));
mPreference.setTemplate( mPreference.setTemplate(
NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */); NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);
@@ -68,7 +68,7 @@ public class DataUsagePreferenceTest {
@Test @Test
public void setTemplate_hasDataUsage_shouldNotDisablePreference() { public void setTemplate_hasDataUsage_shouldNotDisablePreference() {
doReturn(200L).when(mController).getHistoriclUsageLevel(any(NetworkTemplate.class)); doReturn(200L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));
mPreference.setTemplate( mPreference.setTemplate(
NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */); NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);

4
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -493,7 +493,7 @@ public class DataUsageSummaryPreferenceTest {
mSummaryPreference.setUsageNumbers(1000000L, -1L, true); mSummaryPreference.setUsageNumbers(1000000L, -1L, true);
final String cycleText = "The quick fox"; final String cycleText = "The quick fox";
mSummaryPreference.setWifiMode(true, cycleText); mSummaryPreference.setWifiMode(true, cycleText);
doReturn(200L).when(mSummaryPreference).getHistoriclUsageLevel(); doReturn(200L).when(mSummaryPreference).getHistoricalUsageLevel();
bindViewHolder(); bindViewHolder();
assertThat(mUsageTitle.getText().toString()) assertThat(mUsageTitle.getText().toString())
@@ -529,7 +529,7 @@ public class DataUsageSummaryPreferenceTest {
public void testSetWifiMode_noUsageInfo_shouldDisableLaunchButton() { public void testSetWifiMode_noUsageInfo_shouldDisableLaunchButton() {
mSummaryPreference = spy(mSummaryPreference); mSummaryPreference = spy(mSummaryPreference);
mSummaryPreference.setWifiMode(true, "Test cycle text"); mSummaryPreference.setWifiMode(true, "Test cycle text");
doReturn(0L).when(mSummaryPreference).getHistoriclUsageLevel(); doReturn(0L).when(mSummaryPreference).getHistoricalUsageLevel();
bindViewHolder(); bindViewHolder();