Merge "Fix exception when a focused item is detached."

2011-08-01 13:39:30 -07:00
parent 5c31583c53 1ea6889136
commit dbe55b722c
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -2428,7 +2428,7 @@ public class ListView extends AbsListView {
        if (mItemsCanFocus && (focusResult == null)
                && selectedView != null && selectedView.hasFocus()) {
            final View focused = selectedView.findFocus();
-            if (distanceToView(focused) > 0) {
+            if (!isViewAncestorOf(focused, this) || distanceToView(focused) > 0) {
                focused.clearFocus();
            }
        }