Merge "Fix issue #5063010: Loaders don't seem to be properly..." (47a7c68a) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1593,12 +1593,12 @@ public class Activity extends ContextThemeWrapper
	//Log.v(TAG, "invalidateFragmentIndex: index=" + index);		//Log.v(TAG, "invalidateFragmentIndex: index=" + index);
	if (mAllLoaderManagers != null) {		if (mAllLoaderManagers != null) {
	LoaderManagerImpl lm = mAllLoaderManagers.get(index);		LoaderManagerImpl lm = mAllLoaderManagers.get(index);
	if (lm != null) {		if (lm != null && !lm.mRetaining) {
	lm.doDestroy();		lm.doDestroy();
	}
	mAllLoaderManagers.remove(index);		mAllLoaderManagers.remove(index);
	}		}
	}		}
			}

	/**		/**
	* Called when a Fragment is being attached to this activity, immediately		* Called when a Fragment is being attached to this activity, immediately

core/java/android/app/BackStackRecord.java

+16 −5

Original line number	Original line	Diff line number	Diff line
	@@ -224,6 +224,12 @@ final class BackStackRecord extends FragmentTransaction implements
	writer.print(" mExitAnim=#");		writer.print(" mExitAnim=#");
	writer.println(Integer.toHexString(mExitAnim));		writer.println(Integer.toHexString(mExitAnim));
	}		}
			if (mPopEnterAnim != 0 \|\| mPopExitAnim !=0) {
			writer.print(prefix); writer.print("mPopEnterAnim=#");
			writer.print(Integer.toHexString(mPopEnterAnim));
			writer.print(" mPopExitAnim=#");
			writer.println(Integer.toHexString(mPopExitAnim));
			}
	if (mBreadCrumbTitleRes != 0 \|\| mBreadCrumbTitleText != null) {		if (mBreadCrumbTitleRes != 0 \|\| mBreadCrumbTitleText != null) {
	writer.print(prefix); writer.print("mBreadCrumbTitleRes=#");		writer.print(prefix); writer.print("mBreadCrumbTitleRes=#");
	writer.print(Integer.toHexString(mBreadCrumbTitleRes));		writer.print(Integer.toHexString(mBreadCrumbTitleRes));
	@@ -248,13 +254,16 @@ final class BackStackRecord extends FragmentTransaction implements
	writer.print(innerPrefix); writer.print("cmd="); writer.print(op.cmd);		writer.print(innerPrefix); writer.print("cmd="); writer.print(op.cmd);
	writer.print(" fragment="); writer.println(op.fragment);		writer.print(" fragment="); writer.println(op.fragment);
	if (op.enterAnim != 0 \|\| op.exitAnim != 0) {		if (op.enterAnim != 0 \|\| op.exitAnim != 0) {
	writer.print(prefix); writer.print("enterAnim="); writer.print(op.enterAnim);		writer.print(prefix); writer.print("enterAnim=#");
	writer.print(" exitAnim="); writer.println(op.exitAnim);		writer.print(Integer.toHexString(op.enterAnim));
			writer.print(" exitAnim=#");
			writer.println(Integer.toHexString(op.exitAnim));
	}		}
	if (op.popEnterAnim != 0 \|\| op.popExitAnim != 0) {		if (op.popEnterAnim != 0 \|\| op.popExitAnim != 0) {
	writer.print(prefix);		writer.print(prefix); writer.print("popEnterAnim=#");
	writer.print("popEnterAnim="); writer.print(op.popEnterAnim);		writer.print(Integer.toHexString(op.popEnterAnim));
	writer.print(" popExitAnim="); writer.println(op.popExitAnim);		writer.print(" popExitAnim=#");
			writer.println(Integer.toHexString(op.popExitAnim));
	}		}
	if (op.removed != null && op.removed.size() > 0) {		if (op.removed != null && op.removed.size() > 0) {
	for (int i=0; i<op.removed.size(); i++) {		for (int i=0; i<op.removed.size(); i++) {
	@@ -695,11 +704,13 @@ final class BackStackRecord extends FragmentTransaction implements
	} break;		} break;
	case OP_DETACH: {		case OP_DETACH: {
	Fragment f = op.fragment;		Fragment f = op.fragment;
			f.mNextAnim = op.popEnterAnim;
	mManager.attachFragment(f,		mManager.attachFragment(f,
	FragmentManagerImpl.reverseTransit(mTransition), mTransitionStyle);		FragmentManagerImpl.reverseTransit(mTransition), mTransitionStyle);
	} break;		} break;
	case OP_ATTACH: {		case OP_ATTACH: {
	Fragment f = op.fragment;		Fragment f = op.fragment;
			f.mNextAnim = op.popExitAnim;
	mManager.detachFragment(f,		mManager.detachFragment(f,
	FragmentManagerImpl.reverseTransit(mTransition), mTransitionStyle);		FragmentManagerImpl.reverseTransit(mTransition), mTransitionStyle);
	} break;		} break;