From 600f188702c1ce8e5c250ea049a5e22f4ff17577 Mon Sep 17 00:00:00 2001 From: Bjorn Bringert Date: Sat, 21 Nov 2009 21:38:05 +0000 Subject: [PATCH] Guard against null parent in Launcher2.Search.clearAnimation() Sometimes clearAnimation() is called on the search widget when it has no parent, e.g. when it being removed from the home screen. This caused an NPE, because clearAnimation() called invalidate() on the parent. This is a partial fix for: http://b/issue?id=2246760 --- src/com/android/launcher2/Search.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher2/Search.java b/src/com/android/launcher2/Search.java index f9630487cb..283042d19b 100644 --- a/src/com/android/launcher2/Search.java +++ b/src/com/android/launcher2/Search.java @@ -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(); }