Merge "Add a feature flag for the new tether settings UI"

2020-02-03 06:44:43 +00:00
parent afc185e97d 7f5b5d18c5
commit 749e585a3b
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -74,6 +74,8 @@ public class FeatureFlagUtils {
        // Disabled by default until b/148278926 is resolved. This flags guards a feature
        // introduced in R and will be removed in the next release (b/148367230).
        DEFAULT_FLAGS.put(SETTINGS_DO_NOT_RESTORE_PRESERVED, "false");
+
+        DEFAULT_FLAGS.put("settings_tether_all_in_one", "false");
    }

    /**