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

Merge "Check for target SDK version for out-of-order fragment creation." into nyc-mr1-dev

Browse Source
This commit is contained in:
Adam Powell
2016-07-26 23:24:57 +00:00
committed by Android (Google) Code Review
parent 9fd44ef954 00b7846b1e
commit 4e00581e6b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/BackStackRecord.java
View File

@@ -17,6 +17,7 @@
package android.app; package android.app;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils; import android.text.TextUtils;
@@ -852,7 +853,9 @@ final class BackStackRecord extends FragmentTransaction implements
* Ensure that fragments that are entering are at least at the CREATED state * Ensure that fragments that are entering are at least at the CREATED state
* so that they may load Transitions using TransitionInflater. * so that they may load Transitions using TransitionInflater.
*/ */
if (fragment.mState < Fragment.CREATED && mManager.mCurState >= Fragment.CREATED) { if (fragment.mState < Fragment.CREATED && mManager.mCurState >= Fragment.CREATED &&
mManager.mHost.getContext().getApplicationInfo().targetSdkVersion >=
Build.VERSION_CODES.N) {
mManager.makeActive(fragment); mManager.makeActive(fragment);
mManager.moveToState(fragment, Fragment.CREATED, 0, 0, false); mManager.moveToState(fragment, Fragment.CREATED, 0, 0, false);
} }