From 5ad13e0c258a30040cae8a9ea38c7de06070eb97 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 3 Feb 2021 18:11:54 +0000 Subject: [PATCH] Revert "Turn on the feature flag for Android S Settings." This reverts commit 0197d41019204c8451617e5367ddfd43ea2bc749. Reason for revert: DroidMonitor: Potential culprit for Bug 179262029 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Change-Id: Ifed6374b417d10ca76c3c2805ac985282174b367 --- core/java/android/util/FeatureFlagUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 790773fd83c59..b22921233f055 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -65,7 +65,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", "true"); + DEFAULT_FLAGS.put("settings_silky_home", "false"); DEFAULT_FLAGS.put("settings_contextual_home", "false"); DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "false"); }