diff options
| author | 2020-07-09 07:03:16 +0000 | |
|---|---|---|
| committer | 2020-07-09 07:03:16 +0000 | |
| commit | 59ce935e186d7c7c4ba11b6ed756fe705fa2aec7 (patch) | |
| tree | 99796e9dfd8d9e35a4daf195e17b26df8f6b8ce4 | |
| parent | 7accbf46d9dc8011464974622aeef7920910a607 (diff) | |
| parent | edbfd229e83280ede42fcd35e9db0aab5f2a88a1 (diff) | |
Merge "Fixing an embedded display as a top focused display"
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/AccessibilityController.java | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index 468e93a8f683..669bb24e0e77 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -747,6 +747,13 @@ public class AccessibilityWindowManager { * Dumps all {@link AccessibilityWindowInfo}s here. */ void dumpLocked(FileDescriptor fd, final PrintWriter pw, String[] args) { + pw.append("Global Info [ "); + pw.println("Top focused display Id = " + mTopFocusedDisplayId); + pw.println(" Active Window Id = " + mActiveWindowId); + pw.println(" Top Focused Window Id = " + mTopFocusedWindowId); + pw.println(" Accessibility Focused Window Id = " + mAccessibilityFocusedWindowId + + " ]"); + pw.println(); if (mWindows != null) { final int windowCount = mWindows.size(); for (int j = 0; j < windowCount; j++) { diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index f5d68031b493..ecba3f9c27c4 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -1357,7 +1357,12 @@ final class AccessibilityController { addedWindows.clear(); // Gets the top focused display Id and window token for supporting multi-display. - topFocusedDisplayId = mService.mRoot.getTopFocusedDisplayContent().getDisplayId(); + // If this top focused display is an embedded one, using its parent display as the + // top focused display. + final DisplayContent topFocusedDisplayContent = + mService.mRoot.getTopFocusedDisplayContent(); + topFocusedDisplayId = isEmbeddedDisplay(topFocusedDisplayContent) ? mDisplayId + : topFocusedDisplayContent.getDisplayId(); topFocusedWindowToken = topFocusedWindowState.mClient.asBinder(); } mCallback.onWindowsForAccessibilityChanged(forceSend, topFocusedDisplayId, |