diff options
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index bad26edb9649..0cb7c289de5f 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -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"); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java index b6ac467c729f..50044f2cc0ea 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java @@ -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; |