summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zhen Zhang <zzhen@google.com> 2020-02-03 06:44:43 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-02-03 06:44:43 +0000
commit749e585a3bdeb09327ef265a9aead724e5f1c61b (patch)
tree089be0e00d265db943b9aee5740127a3a7ffd8ba
parentafc185e97d132d4bcbca69f5e8e57045ef4a556c (diff)
parent7f5b5d18c53e0703370dcc0e4c65321470d05cc6 (diff)
Merge "Add a feature flag for the new tether settings UI"
-rw-r--r--core/java/android/util/FeatureFlagUtils.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index 6742281dc2b6..5fdac810af29 100644
--- 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");
}
/**