diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-12-28 14:17:18 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-12-28 14:17:18 -0800 |
| commit | 1b39e221e2d2db98f8aea7dd7b7ded3eca6f3d55 (patch) | |
| tree | cebe2e95f3ecc23500ede627b2667ed468e8682a /core/java/android/app | |
| parent | d173fa3b1cb8e4294aba7564c0171894be6c3c24 (diff) | |
| download | frameworks_base-1b39e221e2d2db98f8aea7dd7b7ded3eca6f3d55.zip frameworks_base-1b39e221e2d2db98f8aea7dd7b7ded3eca6f3d55.tar.gz frameworks_base-1b39e221e2d2db98f8aea7dd7b7ded3eca6f3d55.tar.bz2 | |
Fix NPE pointed out by Chet.
Change-Id: Id421476aa6f6ff281054b435ecd09f932966305c
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/FragmentManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |