commit aad97b2341ba9999ffc47d26dbf6722a98177ff3
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 06 04:28:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 06 04:28:37 2018 +0000
tree e3d61b0f68b83a409b8e2463af78f77f1cb5c87b
parent d04a09e8705cb70959e63d7542c3c95861444469
parent 4c7f6c2b381ec51b29b80cddae7278e7c65723ad

Merge "Add feature flag for Safety Hub"

core/java/android/util/FeatureFlagUtils.java

diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index 2d67d79..769dd1b 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -36,6 +36,7 @@
     public static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX;
     public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
     public static final String EMERGENCY_DIAL_SHORTCUTS = "settings_emergency_dial_shortcuts";
+    public static final String SAFETY_HUB = "settings_safety_hub";
     public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";
 
     private static final Map<String, String> DEFAULT_FLAGS;
@@ -51,6 +52,7 @@
         DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");
         DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "true");
         DEFAULT_FLAGS.put("settings_network_and_internet_v2", "false");
+        DEFAULT_FLAGS.put(SAFETY_HUB, "false");
         DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");
     }