From 113617887c5b6724558960e8203d2e5819ea826e Mon Sep 17 00:00:00 2001
From: Jackal Guo <jackalguo@google.com>
Date: Fri, 22 Nov 2019 17:29:41 +0800
Subject: [PATCH] Update accessibility focus correctly in
 AccessibilityWindowManager

The accessibility focus node id isn't updated if the focus window id
doesn't change.

Bug: 144958088
Test: a11y CTS & unit tests
Change-Id: I67e57fb036efa4b89c7b5148fb7cef9dbdd37b7b
---
 .../server/accessibility/AccessibilityWindowManager.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java
index cb858ac11b009..339fc963b4277 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java
@@ -1217,8 +1217,8 @@ public class AccessibilityWindowManager {
                     if (mAccessibilityFocusedWindowId != windowId) {
                         clearAccessibilityFocusLocked(mAccessibilityFocusedWindowId);
                         setAccessibilityFocusedWindowLocked(windowId);
-                        mAccessibilityFocusNodeId = nodeId;
                     }
+                    mAccessibilityFocusNodeId = nodeId;
                 }
             } break;