From c39a5dcbe151e2a55bf8d6c40b56ec875c8715d5 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 4 Jun 2010 14:34:29 -0700 Subject: [PATCH] Fix issue #2733766: Crash in Gallery onDestroy: java.lang.RuntimeException Change-Id: I1c67a6603c23d15fef9a6912c86ffdf77aaa8654 --- core/java/android/app/Activity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 090f6649f42b5..d64f2c585f67b 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2068,8 +2068,10 @@ public class Activity extends ContextThemeWrapper public void onContentChanged() { // First time content is available, let the fragment manager - // attach all of the fragments to it. - if (mFragments.mCurState < Fragment.CONTENT) { + // attach all of the fragments to it. Don't do this if the + // activity is no longer attached (because it is being destroyed). + if (mFragments.mCurState < Fragment.CONTENT + && mFragments.mActivity != null) { mFragments.moveToState(Fragment.CONTENT, false); } }