Merge "Handle edge-case where no focusables exist" into oc-dev

2017-04-19 18:08:23 +00:00
parent e262cc234b 5b860719a3
commit f4c31bf67b
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -4675,7 +4675,8 @@ public final class ViewRootImpl implements ViewParent,
            if (focused == null && mView.restoreDefaultFocus()) {
                return true;
            }
-            View cluster = focused.keyboardNavigationClusterSearch(null, direction);
+            View cluster = focused == null ? keyboardNavigationClusterSearch(null, direction)
+                    : focused.keyboardNavigationClusterSearch(null, direction);

            // Since requestFocus only takes "real" focus directions (and therefore also
            // restoreFocusInCluster), convert forward/backward focus into FOCUS_DOWN.