am 55896f3c: Merge change Ib71193bf into eclair

Merge commit '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-mr2

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

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;
             }