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

Merge "Disable device config syncing by default in test harness mode" am: a680cb9cf8 am: bf4063b7b6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2630821

Change-Id: I6acdf78dcb76b5f704a0c84c4bd941e563e2d2df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Peykov
2023-06-28 20:51:45 +00:00
committed by Automerger Merge Worker
parent 2729555205 bf4063b7b6
commit 21ba7f3fb4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -1245,11 +1245,13 @@ public class SettingsProvider extends ContentProvider {
Setting settingLocked = mSettingsRegistry.getSettingLocked( Setting settingLocked = mSettingsRegistry.getSettingLocked(
SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM, SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM,
Global.DEVICE_CONFIG_SYNC_DISABLED); Global.DEVICE_CONFIG_SYNC_DISABLED);
if (settingLocked == null) { String settingValue = settingLocked == null ? null : settingLocked.getValue();
return SYNC_DISABLED_MODE_NONE; 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 = !"0".equals(settingValue);
boolean isSyncDisabledPersistent = settingValue != null && !"0".equals(settingValue);
return isSyncDisabledPersistent return isSyncDisabledPersistent
? SYNC_DISABLED_MODE_PERSISTENT : SYNC_DISABLED_MODE_NONE; ? SYNC_DISABLED_MODE_PERSISTENT : SYNC_DISABLED_MODE_NONE;
} finally { } finally {