diff options
| author | 2017-05-12 14:25:01 +0000 | |
|---|---|---|
| committer | 2017-05-12 14:25:05 +0000 | |
| commit | 731c41950af2a950f2fb7dbb265ca1ac39710f10 (patch) | |
| tree | 29ac732ee3df846a78a7d8c705a982296260086e | |
| parent | 34bc4af8109b1221305036a528324b8d754b501f (diff) | |
| parent | 20924840ab018fb7af3fbd88d3264b72efaa78c5 (diff) | |
Merge "Re-Re-enable SettingsBackupTest" into oc-dev
| -rw-r--r-- | core/tests/coretests/src/android/provider/SettingsBackupTest.java | 4 |
1 files 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 ee2f1caaf3ae..54d5285e3224 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, |