From 9d9369543be4d17ecd44efb105ac0ed1038d523f Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 5 Apr 2019 14:30:31 -0700 Subject: [PATCH] Remove mainline settings feature flag. Fixes: 123648279 Test: rebuild Change-Id: Iec229482cc249b9fcf1b3e7ec4a3d3c6f7fa8e2c --- core/java/android/util/FeatureFlagUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 336c2e51c4a38..04046fe066e78 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -53,7 +53,6 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put("settings_network_and_internet_v2", "true"); DEFAULT_FLAGS.put("settings_slice_injection", "true"); DEFAULT_FLAGS.put("settings_systemui_theme", "true"); - DEFAULT_FLAGS.put("settings_mainline_module", "true"); DEFAULT_FLAGS.put(DYNAMIC_SYSTEM, "false"); DEFAULT_FLAGS.put(SEAMLESS_TRANSFER, "false"); DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");