Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42105605 authored by Daniel Peykov's avatar Daniel Peykov Committed by Automerger Merge Worker
Browse files

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

Merge "Disable device config syncing by default in test harness mode" am: a680cb9c am: bf4063b7 am: 21ba7f3f

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



Change-Id: Icb26ad625abbfa3f860ae81d6cbe64a73a78873d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1115ec6d 21ba7f3f

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+6 −4
Original line number Diff line number Diff line
@@ -1261,11 +1261,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 {