From 20924840ab018fb7af3fbd88d3264b72efaa78c5 Mon Sep 17 00:00:00 2001 From: Bryan Mawhinney Date: Thu, 11 May 2017 12:50:14 +0100 Subject: [PATCH] Re-Re-enable SettingsBackupTest After fixing blacklists. Bug: 37684646 Test: runtest --path core/tests/coretests/src/android/provider/SettingsBackupTest.java Change-Id: Ib3c93e65dd742009a8c3ef63d628d2748c9e840b --- .../coretests/src/android/provider/SettingsBackupTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index ee2f1caaf3ae9..54d5285e3224a 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -37,8 +37,6 @@ import org.junit.runner.RunWith; /** Tests that ensure appropriate settings are backed up. */ @RunWith(AndroidJUnit4.class) -// TODO(b/37684646): Can re-enable pre-submit once test is fixed. -//@Presubmit @SmallTest public class SettingsBackupTest { @@ -167,6 +165,7 @@ public class SettingsBackupTest { Settings.Global.DEVICE_IDLE_CONSTANTS_WATCH, Settings.Global.BATTERY_SAVER_CONSTANTS, Settings.Global.DEVICE_NAME, + Settings.Global.DEVICE_POLICY_CONSTANTS, Settings.Global.DEVICE_PROVISIONED, Settings.Global.DEVICE_PROVISIONING_MOBILE_DATA_ENABLED, Settings.Global.DISK_FREE_CHANGE_REPORTING_THRESHOLD, @@ -379,6 +378,7 @@ public class SettingsBackupTest { Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS, Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED, + Settings.Global.WIFI_WAKEUP_AVAILABLE, Settings.Global.WIFI_WATCHDOG_ON, Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON, Settings.Global.WINDOW_ANIMATION_SCALE,