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

Merge "Fix getting wrong instance when restoring non-config" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-30 16:27:36 +00:00
committed by Android (Google) Code Review
parent a07ce03d3c 5dd7c9af6d
commit 8386603230
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2725,7 +2725,15 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
Fragment f = nonConfigFragments.get(i); Fragment f = nonConfigFragments.get(i);
if (DEBUG) Log.v(TAG, "restoreAllState: re-attaching retained " + f); if (DEBUG) Log.v(TAG, "restoreAllState: re-attaching retained " + f);
FragmentState fs = fms.mActive[f.mIndex]; int index = 0; // index of f in fms.mActive
while (index < fms.mActive.length && fms.mActive[index].mIndex != f.mIndex) {
index++;
}
if (index == fms.mActive.length) {
throwException(new IllegalStateException("Could not find active fragment "
+ "with index " + f.mIndex));
}
FragmentState fs = fms.mActive[index];
fs.mInstance = f; fs.mInstance = f;
f.mSavedViewState = null; f.mSavedViewState = null;
f.mBackStackNesting = 0; f.mBackStackNesting = 0;