From 9534c20a85c0fc421503be2caba7bd00436589f5 Mon Sep 17 00:00:00 2001
From: Tim Yu <yunicorn@google.com>
Date: Tue, 12 Mar 2024 16:52:44 +0000
Subject: [Autofill] Migrate aconfig flag

migrate services/autofill/bugfixes.aconfig#relayout to deviceconfig

Bug: 294330426
Test: atest CtsAutofillServiceTestCases

Change-Id: I6c15f3385a208e30619db2f184420d0f5732d909
---
 .../android/view/autofill/AutofillFeatureFlags.java   | 19 +++++++++++++++++++
 core/java/android/view/autofill/AutofillManager.java  |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/autofill/AutofillFeatureFlags.java b/core/java/android/view/autofill/AutofillFeatureFlags.java
index 1ca51ad8d65c..644a7a925f81 100644
--- a/core/java/android/view/autofill/AutofillFeatureFlags.java
+++ b/core/java/android/view/autofill/AutofillFeatureFlags.java
@@ -244,6 +244,17 @@ public class AutofillFeatureFlags {
     public static final String DEVICE_CONFIG_IGNORE_VIEW_STATE_RESET_TO_EMPTY =
             "ignore_view_state_reset_to_empty";
 
+    /**
+     * Bugfix flag, Autofill should ignore view updates if an Auth intent is showing.
+     *
+     * See frameworks/base/services/autofill/bugfixes.aconfig#relayout
+     * for more information.
+     *
+     * @hide
+     */
+    public static final String DEVICE_CONFIG_IGNORE_RELAYOUT_WHEN_AUTH_PENDING =
+            "ignore_relayout_auth_pending";
+
     // END AUTOFILL FOR ALL APPS FLAGS //
 
 
@@ -513,6 +524,14 @@ public class AutofillFeatureFlags {
                 false);
     }
 
+    /** @hide */
+    public static boolean shouldIgnoreRelayoutWhenAuthPending() {
+        return DeviceConfig.getBoolean(
+                DeviceConfig.NAMESPACE_AUTOFILL,
+                DEVICE_CONFIG_IGNORE_RELAYOUT_WHEN_AUTH_PENDING,
+                false);
+    }
+
     /**
      * Whether should enable multi-line filter
      *
diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java
index 760a13d0f2a2..26a7deae6bba 100644
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -974,7 +974,7 @@ public final class AutofillManager {
         mShouldIncludeInvisibleViewInAssistStructure =
                 AutofillFeatureFlags.shouldIncludeInvisibleViewInAssistStructure();
 
-        mRelayoutFix = Flags.relayout();
+        mRelayoutFix = AutofillFeatureFlags.shouldIgnoreRelayoutWhenAuthPending();
         mIsCredmanIntegrationEnabled = Flags.autofillCredmanIntegration();
     }
 
-- 
cgit v1.2.3-59-g8ed1b