diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java index d2ad30d7bad..0ee3740c57d 100644 --- a/src/com/android/settings/core/FeatureFlags.java +++ b/src/com/android/settings/core/FeatureFlags.java @@ -21,7 +21,6 @@ package com.android.settings.core; */ public class FeatureFlags { public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher"; - public static final String DYNAMIC_SYSTEM = "settings_dynamic_system"; public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; public static final String SETTINGS_FUSE_FLAG = "settings_fuse"; public static final String WIFI_DETAILS_DATAUSAGE_HEADER = diff --git a/src/com/android/settings/development/DSULoader.java b/src/com/android/settings/development/DSULoader.java index 1c897c47ab6..d4fa0c64646 100644 --- a/src/com/android/settings/development/DSULoader.java +++ b/src/com/android/settings/development/DSULoader.java @@ -55,8 +55,6 @@ import javax.net.ssl.HttpsURLConnection; * also offers the flexibility to overwrite the default setting and load OEMs owned images. */ public class DSULoader extends ListActivity { - public static final String PROPERTY_KEY_FEATURE_FLAG = - "persist.sys.fflag.override.settings_dynamic_system"; private static final int Q_VNDK_BASE = 28; private static final int Q_OS_BASE = 10; @@ -344,7 +342,6 @@ public class DSULoader extends ListActivity { @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); - SystemProperties.set(PROPERTY_KEY_FEATURE_FLAG, "1"); String dsuList = SystemProperties.get(PROPERTY_KEY_LIST); Slog.e(TAG, "Try to get DSU list from: " + PROPERTY_KEY_LIST); if (dsuList == null || dsuList.isEmpty()) { diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java index fb84a720dba..c2ef0f5eb1c 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java @@ -35,7 +35,6 @@ public class FeatureFlagPersistent { static { PERSISTENT_FLAGS = new HashSet<>(); PERSISTENT_FLAGS.add(FeatureFlags.HEARING_AID_SETTINGS); - PERSISTENT_FLAGS.add(FeatureFlags.DYNAMIC_SYSTEM); PERSISTENT_FLAGS.add(FeatureFlags.SETTINGS_FUSE_FLAG); }