diff options
| author | 2023-06-28 20:10:02 +0000 | |
|---|---|---|
| committer | 2023-06-28 20:10:02 +0000 | |
| commit | bf4063b7b6a806585bfcfee955fc5232d84a3004 (patch) | |
| tree | a7b5c05a03c8b91b189e7f4956ae45d99d151226 | |
| parent | 8130300dd5e626f0d302cc5fded7d9bb25a00c4f (diff) | |
| parent | a680cb9cf85b6873eb367a6a0eb054caf3f56916 (diff) | |
Merge "Disable device config syncing by default in test harness mode" am: a680cb9cf8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2630821
Change-Id: Ib068a5baf48495d14d33623c2d3aea2d3aa3dfa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 9d5696306206..8ce33d35e952 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 @@ public class SettingsProvider extends ContentProvider { 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 { |