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 
am: 731c41950a

Change-Id: I1cae217a9a0fe3dc6a86e1c6da3eb54b11f55968
This commit is contained in:
Bryan Mawhinney
2017-05-12 14:30:24 +00:00
committed by android-build-merger
parent 943041abd2 731c41950a
commit 3df94ce03e
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. */ /** Tests that ensure appropriate settings are backed up. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
// TODO(b/37684646): Can re-enable pre-submit once test is fixed.
//@Presubmit
@SmallTest @SmallTest
public class SettingsBackupTest { public class SettingsBackupTest {
@@ -167,6 +165,7 @@ public class SettingsBackupTest {
Settings.Global.DEVICE_IDLE_CONSTANTS_WATCH, Settings.Global.DEVICE_IDLE_CONSTANTS_WATCH,
Settings.Global.BATTERY_SAVER_CONSTANTS, Settings.Global.BATTERY_SAVER_CONSTANTS,
Settings.Global.DEVICE_NAME, Settings.Global.DEVICE_NAME,
Settings.Global.DEVICE_POLICY_CONSTANTS,
Settings.Global.DEVICE_PROVISIONED, Settings.Global.DEVICE_PROVISIONED,
Settings.Global.DEVICE_PROVISIONING_MOBILE_DATA_ENABLED, Settings.Global.DEVICE_PROVISIONING_MOBILE_DATA_ENABLED,
Settings.Global.DISK_FREE_CHANGE_REPORTING_THRESHOLD, Settings.Global.DISK_FREE_CHANGE_REPORTING_THRESHOLD,
@@ -379,6 +378,7 @@ public class SettingsBackupTest {
Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS, Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS,
Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED,
Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED, Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED,
Settings.Global.WIFI_WAKEUP_AVAILABLE,
Settings.Global.WIFI_WATCHDOG_ON, Settings.Global.WIFI_WATCHDOG_ON,
Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON, Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON,
Settings.Global.WINDOW_ANIMATION_SCALE, Settings.Global.WINDOW_ANIMATION_SCALE,