diff options
| author | Ahan Wu <ahanwu@google.com> | 2019-02-20 19:28:50 +0800 |
|---|---|---|
| committer | Ahan Wu <ahanwu@google.com> | 2019-02-20 20:37:47 +0800 |
| commit | e3b06647169c359d652284076a44d92905b95d00 (patch) | |
| tree | 95bfecc3d340568427e0a467304e0aebeabf6138 /core/java/android/util/FeatureFlagUtils.java | |
| parent | b4924521663f0c1f90100d43d6c8b7b66a3c85b4 (diff) | |
Remove AOD_IMAGEWALLPAPER_ENABLED from feature flags
The design of aod image wallpaper has changed and we don't need this
implementation any more so we remove it from feature flags.
Bug: 118470430
Bug: 123617158
Test: Manually
Change-Id: I4d48a8b6b8146b754c1d1f48c35855190219d8a9
Diffstat (limited to 'core/java/android/util/FeatureFlagUtils.java')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 67a40153f5b1..3e3a623ca8ef 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -22,9 +22,7 @@ import android.provider.Settings; import android.text.TextUtils; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; /** * Util class to get feature flag information. @@ -40,11 +38,9 @@ public class FeatureFlagUtils { public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; public static final String SAFETY_HUB = "settings_safety_hub"; public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press"; - public static final String AOD_IMAGEWALLPAPER_ENABLED = "settings_aod_imagewallpaper_enabled"; public static final String GLOBAL_ACTIONS_GRID_ENABLED = "settings_global_actions_grid_enabled"; private static final Map<String, String> DEFAULT_FLAGS; - private static final Set<String> OBSERVABLE_FLAGS; static { DEFAULT_FLAGS = new HashMap<>(); @@ -60,11 +56,7 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false"); DEFAULT_FLAGS.put(SAFETY_HUB, "false"); DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false"); - DEFAULT_FLAGS.put(AOD_IMAGEWALLPAPER_ENABLED, "false"); DEFAULT_FLAGS.put(GLOBAL_ACTIONS_GRID_ENABLED, "false"); - - OBSERVABLE_FLAGS = new HashSet<>(); - OBSERVABLE_FLAGS.add(AOD_IMAGEWALLPAPER_ENABLED); } /** @@ -101,16 +93,6 @@ public class FeatureFlagUtils { */ public static void setEnabled(Context context, String feature, boolean enabled) { SystemProperties.set(FFLAG_OVERRIDE_PREFIX + feature, enabled ? "true" : "false"); - - // Also update Settings.Global if needed so that we can observe it via observer. - if (OBSERVABLE_FLAGS.contains(feature)) { - setObservableFlag(context, feature, enabled); - } - } - - private static void setObservableFlag(Context context, String feature, boolean enabled) { - Settings.Global.putString( - context.getContentResolver(), feature, enabled ? "true" : "false"); } /** |