am 8bfa77b0: am df7edf5d: am 55896f3c: Merge change Ib71193bf into eclair

Merge commit '8bfa77b0e2de840678c026da0fc5ca1ce03d0c1a'

* commit '8bfa77b0e2de840678c026da0fc5ca1ce03d0c1a':
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index ed2139d5f044..47b976bc2f4d 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -1408,8 +1408,8 @@ public final class ViewRoot extends Handler implements ViewParent,
 
             // When in touch mode, focus points to the previously focused view,
             // which may have been removed from the view hierarchy. The following
-            // line checks whether the view is still in the hierarchy
-            if (focus == null || focus.getParent() == null) {
+            // line checks whether the view is still in our hierarchy.
+            if (focus == null || focus.mAttachInfo != mAttachInfo) {
                 mRealFocusedView = null;
                 return false;
             }