diff options
| author | yuanjiahsu <yuanjiahsu@google.com> | 2018-11-20 18:44:55 +0800 |
|---|---|---|
| committer | yuanjiahsu <yuanjiahsu@google.com> | 2018-11-20 20:55:49 +0800 |
| commit | b39b469b1276dd3578b8a778d18de59cb9f7da20 (patch) | |
| tree | 2563dd95613f617a8ec5c1fe253345dabad56f40 /core/java/android/util | |
| parent | 5e2f5f27ffb064b3d774c734b52a754e3682db48 (diff) | |
| parent | 183271d1d240fb2a92628e00b132b4490461f59f (diff) | |
resolve merge conflicts of 183271d1d240fb2a92628e00b132b4490461f59f to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I219a85189fb4207a0605ca541f8ecc29f5ee6808
Diffstat (limited to 'core/java/android/util')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 0cb7c289de5f..5f348c4a73ed 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -35,7 +35,6 @@ public class FeatureFlagUtils { public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override."; public static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX; public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; - public static final String EMERGENCY_DIAL_SHORTCUTS = "settings_emergency_dial_shortcuts"; public static final String SAFETY_HUB = "settings_safety_hub"; public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press"; @@ -49,7 +48,6 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put("settings_data_usage_v2", "true"); DEFAULT_FLAGS.put("settings_seamless_transfer", "false"); DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false"); - DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "true"); DEFAULT_FLAGS.put("settings_network_and_internet_v2", "false"); DEFAULT_FLAGS.put(SAFETY_HUB, "false"); DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false"); |