commit a71dc9b29709cc1534129bac06b8c96ff04ecf00
author Yabin Huang <yabinh@google.com> Mon Sep 21 17:26:36 2020 -0700
committer Yabin Huang <yabinh@google.com> Mon Sep 21 20:14:15 2020 -0700
tree c4d9488efc5f1355af15b797bafd921bbbec1cc6
parent 6131f6d27ef7e4266e4a5c996cb939195dc00aa6

Refresh mFocusedNode before clearing focus

Fixes: 169099380
Test: manual
Change-Id: Ie1ef0d59497dc726ea5a28ac71fdf1d9b5fad0cb

src/com/android/car/rotary/RotaryService.java

diff --git a/src/com/android/car/rotary/RotaryService.java b/src/com/android/car/rotary/RotaryService.java
index f340df2..8bae1b7 100644
--- a/src/com/android/car/rotary/RotaryService.java
+++ b/src/com/android/car/rotary/RotaryService.java
@@ -1612,6 +1612,7 @@
      * might go out of sync.
      */
     private void maybeClearFocusInCurrentWindow(@Nullable AccessibilityNodeInfo targetFocus) {
+        mFocusedNode = Utils.refreshNode(mFocusedNode);
         if (mFocusedNode == null || !mFocusedNode.isFocused()
                 || (targetFocus != null
                         && mFocusedNode.getWindowId() == targetFocus.getWindowId())) {