Changes window and event flags to new PURPOSE_BUGFIX type.
(Requires renaming the flags.)
Bug: 277305460
Bug: 322444245
Test: n/a (mechanical rename)
Change-Id: I27d39fcf0febedc76cdb3173b5e9d9338a5c75ab
diff --git a/services/accessibility/accessibility.aconfig b/services/accessibility/accessibility.aconfig
index 997f3af..04b19ff 100644
--- a/services/accessibility/accessibility.aconfig
+++ b/services/accessibility/accessibility.aconfig
@@ -24,10 +24,13 @@
}
flag {
- name: "compute_window_changes_on_a11y"
+ name: "compute_window_changes_on_a11y_v2"
namespace: "accessibility"
description: "Computes accessibility window changes in accessibility instead of wm package."
bug: "322444245"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
}
flag {
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java
index d307484..6007bfd 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java
@@ -445,7 +445,7 @@
public void onWindowsForAccessibilityChanged(boolean forceSend, int topFocusedDisplayId,
IBinder topFocusedWindowToken, @NonNull List<WindowInfo> windows) {
synchronized (mLock) {
- if (!Flags.computeWindowChangesOnA11y()) {
+ if (!Flags.computeWindowChangesOnA11yV2()) {
// If the flag is enabled, it's already done in #createWindowInfoListLocked.
updateWindowsByWindowAttributesLocked(windows);
}
@@ -491,7 +491,7 @@
/**
* Called when the windows for accessibility changed. This is called if
- * {@link com.android.server.accessibility.Flags.FLAG_COMPUTE_WINDOW_CHANGES_ON_A11Y} is
+ * {@link com.android.server.accessibility.Flags.FLAG_COMPUTE_WINDOW_CHANGES_ON_A11Y_V2} is
* true.
*
* @param forceSend Send the windows for accessibility even if they haven't
@@ -996,7 +996,7 @@
final int windowId = findWindowIdLocked(userId, window.token);
// With the flag enabled, createWindowInfoListLocked() already removes invalid windows.
- if (!Flags.computeWindowChangesOnA11y()) {
+ if (!Flags.computeWindowChangesOnA11yV2()) {
if (windowId < 0) {
return null;
}