commit 80ec4ab7f56646e464dbe6ff123703a178401b90
author Adam Powell <adamp@google.com> Wed Feb 01 17:46:55 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 01 17:46:55 2012 -0800
tree 27ae36a63805654874aaab351ac5f165e6acaf04
parent 81453f761a21c4d76dfd2f81c8651eab3217b3df
parent 2d8b0170bff5076df7a39e6d01e407accec5f779

Merge "Fix bug 5339708 - edge case in ListView focus restoration"

core/java/android/widget/ListView.java

diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java
index e20d12a..67fd059 100644
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -1651,6 +1651,7 @@
                 // are focusable
                 if (mItemsCanFocus && hasFocus() && !sel.hasFocus()) {
                     final boolean focusWasTaken = (sel == focusLayoutRestoreDirectChild &&
+                            focusLayoutRestoreView != null &&
                             focusLayoutRestoreView.requestFocus()) || sel.requestFocus();
                     if (!focusWasTaken) {
                         // selected item didn't take focus, fine, but still want