diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-05 23:33:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-05 23:33:16 +0000 |
| commit | 1ccf640d56159e33f6feb1d7ab49a4cdfa0a344e (patch) | |
| tree | 034da2609c4e1034c456bba0272319c48eaca21e /core/java/android | |
| parent | 6e14a0326ec06e547fb170c1ee901f8fce9927db (diff) | |
| parent | 9d9369543be4d17ecd44efb105ac0ed1038d523f (diff) | |
Merge "Remove mainline settings feature flag." into qt-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 336c2e51c4a3..04046fe066e7 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"); |