diff options
| author | Julia Reynolds <juliacr@google.com> | 2020-04-02 12:44:47 -0400 |
|---|---|---|
| committer | Julia Reynolds <juliacr@google.com> | 2020-04-02 16:28:40 -0400 |
| commit | e24faa2c8692bb37a0e3969448ce90ac24d29e87 (patch) | |
| tree | 263056fbfb993b1fcc6550e82c89267723d4bdd5 /core/java/android/util/FeatureFlagUtils.java | |
| parent | 281e02a7723c2abde68d6fc359847cd4eb235cb7 (diff) | |
Store conversation requirement in a setting
So we can show it in developer options. Also fix a bug
where the setting wasn't being respected in systemui.
Test: atest
Bug: 152907434
Change-Id: I1eaed93a0c8a1ec4486c7072972e2f924402bb94
Diffstat (limited to 'core/java/android/util/FeatureFlagUtils.java')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index faa5cf591408..cd20b357e2f1 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -42,8 +42,6 @@ public class FeatureFlagUtils { public static final String DYNAMIC_SYSTEM = "settings_dynamic_system"; public static final String SETTINGS_WIFITRACKER2 = "settings_wifitracker2"; public static final String SETTINGS_FUSE_FLAG = "settings_fuse"; - public static final String NOTIF_CONVO_BYPASS_SHORTCUT_REQ = - "settings_notif_convo_bypass_shortcut_req"; /** @hide */ public static final String SETTINGS_DO_NOT_RESTORE_PRESERVED = "settings_do_not_restore_preserved"; @@ -66,7 +64,6 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put(SETTINGS_WIFITRACKER2, "true"); DEFAULT_FLAGS.put("settings_controller_loading_enhancement", "false"); DEFAULT_FLAGS.put("settings_conditionals", "false"); - DEFAULT_FLAGS.put(NOTIF_CONVO_BYPASS_SHORTCUT_REQ, "true"); // This flags guards a feature introduced in R and will be removed in the next release // (b/148367230). DEFAULT_FLAGS.put(SETTINGS_DO_NOT_RESTORE_PRESERVED, "true"); |