commit 3cbbe363b9af1d264347789fc1df28d344e0cf20
author dakinola <dakinola@google.com> Wed Sep 25 16:30:14 2024 +0000
committer Daniel Akinola <dakinola@google.com> Thu Sep 26 13:24:23 2024 +0000
tree 19c30d1d173a6f17cf2f77b9f5f045fd1b240d8b
parent e647a8ee9de70d3afcfa3278213016911d2136ab

Move TYPE_WINDOW_CONTROL toString flag check

Moving flag check so it doesn't break adb window dump command

Fix: 349901649
Test: manually testing `adb shell uiautomator dump --windows`
Flag: android.view.accessibility.enable_type_window_control
Change-Id: I7658688f5e95f5aa2e101e99fe2c236704f8200c

core/java/android/view/accessibility/AccessibilityWindowInfo.java

diff --git a/core/java/android/view/accessibility/AccessibilityWindowInfo.java b/core/java/android/view/accessibility/AccessibilityWindowInfo.java
index c92593f..7b6e070 100644
--- a/core/java/android/view/accessibility/AccessibilityWindowInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityWindowInfo.java
@@ -880,10 +880,6 @@
      * @hide
      */
     public static String typeToString(int type) {
-        if (Flags.enableTypeWindowControl() && type == TYPE_WINDOW_CONTROL) {
-            return "TYPE_WINDOW_CONTROL";
-        }
-
         switch (type) {
             case TYPE_APPLICATION: {
                 return "TYPE_APPLICATION";
@@ -903,8 +899,12 @@
             case TYPE_MAGNIFICATION_OVERLAY: {
                 return "TYPE_MAGNIFICATION_OVERLAY";
             }
-            default:
+            default: {
+                if (Flags.enableTypeWindowControl() && type == TYPE_WINDOW_CONTROL) {
+                    return "TYPE_WINDOW_CONTROL";
+                }
                 return "<UNKNOWN:" + type + ">";
+            }
         }
     }