commit d9ed9ea66ab1ceffc804cfff586cf07959558e78
author Danny Epstein <depstein@google.com> Fri Nov 13 19:15:12 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 13 19:15:12 2020 +0000
tree 4db1db7fb53c747146917930d65bf0bf37917eaa
parent 05bd0a92e0310bd61ac81bdd1d3a83e69e520f6d
parent 40c549b31ce04ed5ba970f4121c0f6bb31e4b58c

Merge "Search from root after nudge" into rvc-qpr-dev

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 896b4c3..dd0704d 100644
--- a/src/com/android/car/rotary/RotaryService.java
+++ b/src/com/android/car/rotary/RotaryService.java
@@ -1164,7 +1164,11 @@
         arguments.putInt(NUDGE_DIRECTION, direction);
         if (mFocusArea.performAction(ACTION_NUDGE_SHORTCUT, arguments)) {
             L.d("Nudge to shortcut view");
-            findFocusedNode(mFocusArea);
+            AccessibilityNodeInfo root = Utils.getRoot(mFocusArea);
+            if (root != null) {
+                findFocusedNode(root);
+                root.recycle();
+            }
             return true;
         }
 
@@ -1174,7 +1178,11 @@
         arguments.putInt(NUDGE_DIRECTION, direction);
         if (mFocusArea.performAction(ACTION_NUDGE_TO_ANOTHER_FOCUS_AREA, arguments)) {
             L.d("Nudge to user specified FocusArea");
-            findFocusedNode(mFocusArea);
+            AccessibilityNodeInfo root = Utils.getRoot(mFocusArea);
+            if (root != null) {
+                findFocusedNode(root);
+                root.recycle();
+            }
             return true;
         }
 
@@ -1269,7 +1277,7 @@
                     mNavigator.findScrollableContainer(mFocusedNode);
             if (scrollableContainer != null) {
                 injectScrollEvent(scrollableContainer, clockwise, remainingRotationCount);
-                scrollableContainer.recycle();;
+                scrollableContainer.recycle();
             }
         }
     }

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

diff --git a/src/com/android/car/rotary/Utils.java b/src/com/android/car/rotary/Utils.java
index 5513361..23560ad 100644
--- a/src/com/android/car/rotary/Utils.java
+++ b/src/com/android/car/rotary/Utils.java
@@ -373,4 +373,19 @@
         }
         return null;
     }
+
+    /**
+     * Returns the root node in the tree containing {@code node}. Returns null if unable to get
+     * the root node for any reason. The caller is responsible for recycling the result.
+     */
+    @Nullable
+    static AccessibilityNodeInfo getRoot(@NonNull AccessibilityNodeInfo node) {
+        AccessibilityWindowInfo window = node.getWindow();
+        if (window == null) {
+            return null;
+        }
+        AccessibilityNodeInfo root = window.getRoot();
+        window.recycle();
+        return root;
+    }
 }