Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06bf3f19 authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Remove feature flag "settings_dynamic_system"" am: df58c650 am: 7ac7030d 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11d9849150aac649b704cfa129256deba6ac862b
parents 195b1378 7ac7030d

src/com/android/settings/core/FeatureFlags.java

+0 −1
Original line number Diff line number Diff line
@@ -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 =

src/com/android/settings/development/DSULoader.java

+0 −3
Original line number Diff line number Diff line
@@ -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()) {

src/com/android/settings/development/featureflags/FeatureFlagPersistent.java

+0 −1
Original line number Diff line number Diff line
@@ -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);

    }