commit a5ffafbfda3b5f6dd7f883045b6b0da0556b934c
author Doris Ling <dling@google.com> Thu Feb 08 20:47:05 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 08 20:47:05 2018 +0000
tree 1ec7c98247344a3706c6771ca28821be39bd7239
parent 5b5e00aca196b6492d75feed22a66d4cb9c75714
parent 933026a3842fa6c3c2188275878b6d90b2025b2b

Merge "Revert "Turn on about phone v2""

core/java/android/util/FeatureFlagUtils.java

diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index 1ead0b4..3c3190b 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -37,11 +37,12 @@
     private static final Map<String, String> DEFAULT_FLAGS;
     static {
         DEFAULT_FLAGS = new HashMap<>();
+        DEFAULT_FLAGS.put("device_info_v2", "true");
         DEFAULT_FLAGS.put("settings_connected_device_v2", "true");
         DEFAULT_FLAGS.put("settings_battery_v2", "true");
         DEFAULT_FLAGS.put("settings_battery_display_app_list", "false");
         DEFAULT_FLAGS.put("settings_zone_picker_v2", "true");
-        DEFAULT_FLAGS.put("settings_about_phone_v2", "true");
+        DEFAULT_FLAGS.put("settings_about_phone_v2", "false");
         DEFAULT_FLAGS.put("settings_bluetooth_while_driving", "false");
         DEFAULT_FLAGS.put("settings_data_usage_v2", "false");
     }