Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1705f4b5 authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

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

am: be99bf2c

Change-Id: I5d6ff3492ab51b530480bfbf3b5856d3281cb183
parents 9682b50e be99bf2c
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -2725,7 +2725,15 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
            for (int i = 0; i < count; i++) {
                Fragment f = nonConfigFragments.get(i);
                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;
                f.mSavedViewState = null;
                f.mBackStackNesting = 0;