summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorDaniel Chapin <chapin@google.com>2021-02-08 18:50:05 +0000
committerDaniel Chapin <chapin@google.com>2021-02-08 18:50:05 +0000
commit0ded361ef4a92652d70fb95857c3dd899c0f2bb8 (patch)
tree78beaaa4f8e39f21d1000e69b67342d2b2193b23 /core/java/android
parent2b4207db1250284bdc39b99b79e40b0a32dce49d (diff)
Revert "Revert "Revert "Turn on the feature flag for Android S S..."
Revert submission 13479025-multiuser_test Reason for revert: Bug: 179457252 Reverted Changes: I9e3d23f93:Fix the broken test Id05757c49:Revert "Revert "Turn on the feature flag for Andro... Change-Id: I4f77afda470b226007bfffda7f536df3b1d4d28a
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/util/FeatureFlagUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index 790773fd83c5..b22921233f05 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");
}