diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-07 03:58:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-07 03:58:21 +0000 |
| commit | 8bfdc107ccdc7c9fc73ce04faac68d6edc18f537 (patch) | |
| tree | 0c4c2857f249ef9410f33ee3a5320ea39ce14625 /core/java/android/util | |
| parent | 5ea3af2c6de146a6e0bf99bfc6a5ee626ec79905 (diff) | |
| parent | 5eb9c8fada697636721721ab534c61801544a9d9 (diff) | |
Merge "Store conversation requirement in a setting" into rvc-dev am: 5eb9c8fada
Change-Id: I7cb2dde555ac4480d3ad18c675f3a6466184345b
Diffstat (limited to 'core/java/android/util')
| -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"); |