commit f349c20c1ce108c342fbf3addb5af26b3664919a
author Qasid Ahmad Sadiq <qasid@google.com> Fri Apr 19 05:56:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 19 05:56:48 2019 -0700
tree 47ca268a410baca1f31601a2a62a54b6d62fd9e8
parent 40607f4533ce31c32f9e2ef3bfc7ead1831c2c30
parent f84cc965fe082879d891e4caafc07b8cf97a4b96

Merge "Make sure focused window is tracked by accessibility even if it is obscured." into qt-dev
am: f84cc965fe

Change-Id: I100bacbecefca5c809442304170f19610af398f5

services/core/java/com/android/server/wm/AccessibilityController.java

diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java
index 0ebd092..6ce42ec 100644
--- a/services/core/java/com/android/server/wm/AccessibilityController.java
+++ b/services/core/java/com/android/server/wm/AccessibilityController.java
@@ -1132,7 +1132,7 @@
                 HashSet<Integer> skipRemainingWindowsForTasks = new HashSet<>();
 
                 // Iterate until we figure out what is touchable for the entire screen.
-                for (int i = visibleWindowCount - 1; i >= 0 && !unaccountedSpace.isEmpty(); i--) {
+                for (int i = visibleWindowCount - 1; i >= 0; i--) {
                     final WindowState windowState = visibleWindows.valueAt(i);
 
                     final Rect boundsInScreen = mTempRect;
@@ -1143,6 +1143,11 @@
                         addPopulatedWindowInfo(windowState, boundsInScreen, windows, addedWindows);
                         updateUnaccountedSpace(windowState, boundsInScreen, unaccountedSpace,
                                 skipRemainingWindowsForTasks);
+                        focusedWindowAdded |= windowState.isFocused();
+                    }
+
+                    if (unaccountedSpace.isEmpty() && focusedWindowAdded) {
+                        break;
                     }
                 }