Merge "Disable device config syncing by default in test harness mode"
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 9d569630..8ce33d3 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1245,11 +1245,13 @@
Setting settingLocked = mSettingsRegistry.getSettingLocked(
SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM,
Global.DEVICE_CONFIG_SYNC_DISABLED);
- if (settingLocked == null) {
- return SYNC_DISABLED_MODE_NONE;
+ String settingValue = settingLocked == null ? null : settingLocked.getValue();
+ if (settingValue == null) {
+ // Disable sync by default in test harness mode.
+ return ActivityManager.isRunningInUserTestHarness()
+ ? SYNC_DISABLED_MODE_PERSISTENT : SYNC_DISABLED_MODE_NONE;
}
- String settingValue = settingLocked.getValue();
- boolean isSyncDisabledPersistent = settingValue != null && !"0".equals(settingValue);
+ boolean isSyncDisabledPersistent = !"0".equals(settingValue);
return isSyncDisabledPersistent
? SYNC_DISABLED_MODE_PERSISTENT : SYNC_DISABLED_MODE_NONE;
} finally {