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

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

Turn on feature flag for data usage v2. 

- and update failing test case.

Change-Id: I6c12ce1fbae4ffa0c183df8a2bbf6867886b4986
Fixes: 117433810
Test: make RunSettingsLibRoboTests
parent 4548699c

core/java/android/util/FeatureFlagUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put("settings_systemui_theme", "true");

        DEFAULT_FLAGS.put("settings_dynamic_homepage", "true");

        DEFAULT_FLAGS.put("settings_mobile_network_v2", "true");

        DEFAULT_FLAGS.put("settings_data_usage_v2", "false");

        DEFAULT_FLAGS.put("settings_data_usage_v2", "true");

        DEFAULT_FLAGS.put("settings_seamless_transfer", "false");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");

        DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "true");

packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java

+6 −3
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ public class DataUsageControllerTest { 
    }



    @Test

    public void getHistoricalUsageLevel_noNetworkSession_shouldReturnNegative1() {

    public void getHistoricalUsageLevel_v1_noNetworkSession_shouldReturnNegative1() {

        FeatureFlagUtils.setEnabled(mContext, DataUsageController.DATA_USAGE_V2, false);

        doReturn(null).when(mController).getSession();



        assertThat(mController.getHistoricalUsageLevel(null /* template */)).isEqualTo(-1L);
@@ -88,7 +89,8 @@ public class DataUsageControllerTest { 
    }



    @Test

    public void getHistoriclUsageLevel_noUsageData_shouldReturn0() {

    public void getHistoriclUsageLevel_v1_noUsageData_shouldReturn0() {

        FeatureFlagUtils.setEnabled(mContext, DataUsageController.DATA_USAGE_V2, false);

        doReturn(mSession).when(mController).getSession();



        assertThat(mController.getHistoricalUsageLevel(NetworkTemplate.buildTemplateWifiWildcard()))
@@ -97,7 +99,8 @@ public class DataUsageControllerTest { 
    }



    @Test

    public void getHistoricalUsageLevel_hasUsageData_shouldReturnTotalUsage() {

    public void getHistoricalUsageLevel_v1_hasUsageData_shouldReturnTotalUsage() {

        FeatureFlagUtils.setEnabled(mContext, DataUsageController.DATA_USAGE_V2, false);

        doReturn(mSession).when(mController).getSession();

        final long receivedBytes = 743823454L;

        final long transmittedBytes = 16574289L;