commit a53174f0a79f8ed9f83f75742acc5ce7c5579832
author Holly Sun <jiuyu@google.com> Fri Sep 01 20:41:58 2023 +0000
committer Holly Sun <jiuyu@google.com> Fri Sep 01 20:41:58 2023 +0000
tree 780e50edd6f9daee02f9d92e7507f6034b91483f
parent 2faacdc36a1f14a56523dc8d6600803c9e7209ca

Remove feature flag on main branch.

To solve merge conflict issue.

Bug: 294858168
Test: build
Change-Id: I8f1630fd3b9191f736393119b15f2d05aaff65a8

core/java/android/util/FeatureFlagUtils.java

diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index 5fe2aa1..12527e9 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -254,7 +254,6 @@
         DEFAULT_FLAGS.put(SETTINGS_ENABLE_LOCKSCREEN_TRANSFER_API, "true");
         DEFAULT_FLAGS.put(SETTINGS_REMOTE_DEVICE_CREDENTIAL_VALIDATION, "true");
         DEFAULT_FLAGS.put(SETTINGS_BIOMETRICS2_FINGERPRINT_SETTINGS, "false");
-        DEFAULT_FLAGS.put("settings_press_hold_nav_handle_to_search", "false");
         // TODO: b/298454866 Replace with Trunk Stable Feature Flag
         DEFAULT_FLAGS.put(SETTINGS_REMOTEAUTH_ENROLLMENT_SETTINGS, "false");
     }