commit 49f5daf2a561d9e15e6dae83784b0fa6c409450f
author Bjorn Bringert <bringert@android.com> Tue Nov 24 14:06:39 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 24 14:06:39 2009 -0800
tree 9b0ab4f6cb66e2492ca83f1a9865ba1d9026e7ac
parent 81d9ca51dfc7a1bf5219f7801800d7739fc103ee
parent 869c881d9c174b94452f8ba8ccb1d816625aafe4

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

Merge commit '869c881d9c174b94452f8ba8ccb1d816625aafe4'

* commit '869c881d9c174b94452f8ba8ccb1d816625aafe4':
  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();
             }