Merge "Revert "Revert "Revert "Revert "Turn on the feature flag for And..."" into sc-dev am: c74a9955d5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64fec7315b5e9df0f157fdca5c06e49d6888f6fd
This commit is contained in:
TreeHugger Robot
2021-03-05 11:39:24 +00:00
committed by Automerger Merge Worker

View File

@@ -68,7 +68,7 @@ public class FeatureFlagUtils {
DEFAULT_FLAGS.put(SETTINGS_DO_NOT_RESTORE_PRESERVED, "true");
DEFAULT_FLAGS.put("settings_tether_all_in_one", "false");
DEFAULT_FLAGS.put("settings_silky_home", "false");
DEFAULT_FLAGS.put("settings_silky_home", "true");
DEFAULT_FLAGS.put("settings_contextual_home", "false");
DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "false");
DEFAULT_FLAGS.put(SETTINGS_USE_NEW_BACKUP_ELIGIBILITY_RULES, "false");