diff options
| author | Po-Chien Hsueh <pchsueh@google.com> | 2019-04-03 07:55:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-03 07:55:55 +0000 |
| commit | 2d204b39854a57ff9c82fc184ee45db6d74916dc (patch) | |
| tree | 5b2c4af51744308644daff2e693b52d8216ebe4d /core/java/android/util/FeatureFlagUtils.java | |
| parent | be8b2e8583583997f96bdbe7132f62dba5889182 (diff) | |
| parent | 91508ea20db5b1db37c8fed06bcf8075b06906f6 (diff) | |
Merge changes from topic "dyn_system_ff"
* changes:
Use setEnable() when there is an installed image
Use gsid.isGsiEnabled to refine DynamicSystemService
Use FeatureFlagPersistent to guard DynamicSystem
Make feature flag settings_dynamic_system persistent
Diffstat (limited to 'core/java/android/util/FeatureFlagUtils.java')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 7f6423a74ced..5d33b49e181b 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -41,6 +41,7 @@ public class FeatureFlagUtils { public static final String GLOBAL_ACTIONS_GRID_ENABLED = "settings_global_actions_grid_enabled"; public static final String GLOBAL_ACTIONS_PANEL_ENABLED = "settings_global_actions_panel_enabled"; + public static final String DYNAMIC_SYSTEM = "settings_dynamic_system"; private static final Map<String, String> DEFAULT_FLAGS; @@ -52,7 +53,7 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put("settings_slice_injection", "true"); DEFAULT_FLAGS.put("settings_systemui_theme", "true"); DEFAULT_FLAGS.put("settings_mainline_module", "true"); - DEFAULT_FLAGS.put("settings_dynamic_system", "false"); + DEFAULT_FLAGS.put(DYNAMIC_SYSTEM, "false"); DEFAULT_FLAGS.put(SEAMLESS_TRANSFER, "false"); DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false"); DEFAULT_FLAGS.put(SAFETY_HUB, "true"); |