PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I141aeae1f09a535aad5084f335c6ecbed696bfde
This commit is contained in:
Yo Chiang
2021-01-26 11:34:53 +00:00
committed by Automerger Merge Worker
parent 9229794727 df58c6505d
commit 7ac7030d49
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/core/FeatureFlags.java
View File

@@ -21,7 +21,6 @@ package com.android.settings.core;
*/ */
public class FeatureFlags { public class FeatureFlags {
public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher"; 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 HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
public static final String SETTINGS_FUSE_FLAG = "settings_fuse"; public static final String SETTINGS_FUSE_FLAG = "settings_fuse";
public static final String WIFI_DETAILS_DATAUSAGE_HEADER = public static final String WIFI_DETAILS_DATAUSAGE_HEADER =

3
src/com/android/settings/development/DSULoader.java
View File

@@ -55,8 +55,6 @@ import javax.net.ssl.HttpsURLConnection;
* also offers the flexibility to overwrite the default setting and load OEMs owned images. * also offers the flexibility to overwrite the default setting and load OEMs owned images.
*/ */
public class DSULoader extends ListActivity { 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_VNDK_BASE = 28;
private static final int Q_OS_BASE = 10; private static final int Q_OS_BASE = 10;
@@ -344,7 +342,6 @@ public class DSULoader extends ListActivity {
@Override @Override
protected void onCreate(Bundle icicle) { protected void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
SystemProperties.set(PROPERTY_KEY_FEATURE_FLAG, "1");
String dsuList = SystemProperties.get(PROPERTY_KEY_LIST); String dsuList = SystemProperties.get(PROPERTY_KEY_LIST);
Slog.e(TAG, "Try to get DSU list from: " + PROPERTY_KEY_LIST); Slog.e(TAG, "Try to get DSU list from: " + PROPERTY_KEY_LIST);
if (dsuList == null || dsuList.isEmpty()) { if (dsuList == null || dsuList.isEmpty()) {

1
src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
View File

@@ -35,7 +35,6 @@ public class FeatureFlagPersistent {
static { static {
PERSISTENT_FLAGS = new HashSet<>(); PERSISTENT_FLAGS = new HashSet<>();
PERSISTENT_FLAGS.add(FeatureFlags.HEARING_AID_SETTINGS); PERSISTENT_FLAGS.add(FeatureFlags.HEARING_AID_SETTINGS);
PERSISTENT_FLAGS.add(FeatureFlags.DYNAMIC_SYSTEM);
PERSISTENT_FLAGS.add(FeatureFlags.SETTINGS_FUSE_FLAG); PERSISTENT_FLAGS.add(FeatureFlags.SETTINGS_FUSE_FLAG);
} }