Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Throw exception in FragmentManager when queuing to a destroyed activity" into klp-dev

Browse Source
This commit is contained in:
Alan Viverette
2013-08-14 22:55:55 +00:00
committed by Android (Google) Code Review
parent 12285f3d9f 95a4609b90
commit 5482ab01e3
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/FragmentManager.java
View File

@@ -1328,12 +1328,19 @@ final class FragmentManagerImpl extends FragmentManager {
} }
} }
/**
* Adds an action to the queue of pending actions.
*
* @param action the action to add
* @param allowStateLoss whether to allow loss of state information
* @throws IllegalStateException if the activity has been destroyed
*/
public void enqueueAction(Runnable action, boolean allowStateLoss) { public void enqueueAction(Runnable action, boolean allowStateLoss) {
if (!allowStateLoss) { if (!allowStateLoss) {
checkStateLoss(); checkStateLoss();
} }
synchronized (this) { synchronized (this) {
if (mActivity == null) { if (mDestroyed || mActivity == null) {
throw new IllegalStateException("Activity has been destroyed"); throw new IllegalStateException("Activity has been destroyed");
} }
if (mPendingActions == null) { if (mPendingActions == null) {