commit 71d62119dffa9c898ce4adfa015dc9edcb7cb4b6
author Yabin Huang <yabinh@google.com> Fri Jan 17 01:50:53 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 17 01:50:53 2020 +0000
tree 299e43219b90281c9355894781f904e94121b5a7
parent 8468378f2b75eb573f3b5f449609a51a4fc43cd8
parent ef8a8ac927ba131c1d4a44bcc97663f389e8f6ac

Merge "Don't use View ID to search next focus backward View"

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 562ed0e..6724e9d 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -12602,11 +12602,10 @@
                 return findViewInsideOutShouldExist(root, mNextFocusForwardId);
             case FOCUS_BACKWARD: {
                 if (mID == View.NO_ID) return null;
-                final int id = mID;
                 return root.findViewByPredicateInsideOut(this, new Predicate<View>() {
                     @Override
                     public boolean test(View t) {
-                        return t.mNextFocusForwardId == id;
+                        return t.findViewById(t.mNextFocusForwardId) == View.this;
                     }
                 });
             }