commit 869c881d9c174b94452f8ba8ccb1d816625aafe4
author Bjorn Bringert <bringert@android.com> Tue Nov 24 14:00:51 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 24 14:00:51 2009 -0800
tree 0890cf1cc921f6b129b80b0b6da2207dc313da83
parent db1eb1bd40f68d53a89085ff10e54dc22393791d
parent 2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3

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()

src/com/android/launcher2/Search.java

diff --git a/src/com/android/launcher2/Search.java b/src/com/android/launcher2/Search.java
index f963048..283042d 100644
--- a/src/com/android/launcher2/Search.java
+++ b/src/com/android/launcher2/Search.java
@@ -253,7 +253,8 @@
             if (animation.hasEnded() 
                     && animation.getFillAfter()
                     && animation.willChangeBounds()) {
-                ((View) getParent()).invalidate();
+                View parent = (View) getParent();
+                if (parent != null) parent.invalidate();
             } else {
                 invalidate();
             }