am 2b68660d: am 600f1887: Guard against null parent in Launcher2.Search.clearAnimation()

Merge commit '2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3' into eclair-mr2-plus-aosp

* commit '2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3':
  Guard against null parent in Launcher2.Search.clearAnimation()
This commit is contained in:
Bjorn Bringert
2009-11-24 14:00:51 -08:00
committed by Android Git Automerger
+2 -1
View File
@@ -253,7 +253,8 @@ public class Search extends LinearLayout
if (animation.hasEnded()
&& animation.getFillAfter()
&& animation.willChangeBounds()) {
((View) getParent()).invalidate();
View parent = (View) getParent();
if (parent != null) parent.invalidate();
} else {
invalidate();
}