commit 654281bcd132400b0358e40d26e973da5fa64b41
author Evan Rosky <erosky@google.com> Mon Apr 03 23:17:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 03 23:17:45 2017 +0000
tree 0678ce83c96423457ae325a3789b2884b292876a
parent 1148bc819a9e299453fe274eb80b453ac641ca55
parent fe9ce65491a6a433829ca12c97ad610723709d1a

Merge "Handle edge-case where the focus-search root is focused" into oc-dev
am: fe9ce65491

Change-Id: I8232e1313e9e9babb152fcd03f1e6e224a979e52

core/java/android/view/FocusFinder.java

diff --git a/core/java/android/view/FocusFinder.java b/core/java/android/view/FocusFinder.java
index ae1ee42..d25e5f0 100644
--- a/core/java/android/view/FocusFinder.java
+++ b/core/java/android/view/FocusFinder.java
@@ -118,7 +118,7 @@
      * @return the "effective" root of {@param focused}
      */
     private ViewGroup getEffectiveRoot(ViewGroup root, View focused) {
-        if (focused == null) {
+        if (focused == null || focused == root) {
             return root;
         }
         ViewParent effective = focused.getParent();