Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-Re-enable SettingsBackupTest" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-12 14:25:01 +00:00
committed by Android (Google) Code Review
parent 34bc4af810 20924840ab
commit 731c41950a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -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,