commit 933026a3842fa6c3c2188275878b6d90b2025b2b
author Doris Ling <dling@google.com> Thu Feb 08 20:43:43 2018 +0000
committer Doris Ling <dling@google.com> Thu Feb 08 20:43:43 2018 +0000
tree 27ab21fc5a3d87e554c295f471987e355458ec51
parent ab4ed1169aadf3967db648a016356beaf6d8f950

Revert "Turn on about phone v2"

This reverts commit ab4ed1169aadf3967db648a016356beaf6d8f950.

Bug: 73102865
Change-Id: I029064d144b891cb6eefacc2ad648a821fa49ec0
Test: rebuild

core/java/android/util/FeatureFlagUtils.java

diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index 7c6d057..410cdc6 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");
     }