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

Commit a680cb9c authored by Daniel Peykov's avatar Daniel Peykov Committed by Gerrit Code Review
Browse files

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

parents 73218d88 43bc2116

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

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