From 1b39e221e2d2db98f8aea7dd7b7ded3eca6f3d55 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 28 Dec 2010 14:17:18 -0800 Subject: Fix NPE pointed out by Chet. Change-Id: Id421476aa6f6ff281054b435ecd09f932966305c --- core/java/android/app/FragmentManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/java/android/app') diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index b5da010..08167c1 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -827,8 +827,9 @@ final class FragmentManagerImpl extends FragmentManager { // animation right now -- it is not needed, // and we can't wait any more on destroying // the fragment. + Animator anim = f.mAnimatingAway; f.mAnimatingAway = null; - f.mAnimatingAway.cancel(); + anim.cancel(); } } if (f.mAnimatingAway != null) { -- cgit v1.1