commit a0811c0e93b9ec1ad1874a18789ea0dd5d0508ee
author Daniel Akinola <dakinola@google.com> Thu Sep 26 23:27:17 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 26 23:27:17 2024 +0000
tree 8061f930a43abd38375cbe1abb89d7ec89117f60
parent 81da5e4ca2d99fcaefa2cc6de09446377fb74c7e
parent 3cbbe363b9af1d264347789fc1df28d344e0cf20

Merge "Move TYPE_WINDOW_CONTROL toString flag check" into main

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 + ">";
+            }
         }
     }