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

Commit 11855f31 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 388d4801: Merge "Working on issue #6561352: java.lang.RuntimeException:... 

am 388d4801: Merge "Working on issue #6561352: java.lang.RuntimeException: Unable to start..." into jb-dev

* commit '388d4801':
  Working on issue #6561352: java.lang.RuntimeException: Unable to start...
parents c6dd2dd4 388d4801

core/java/android/app/FragmentManager.java

+18 −1
Original line number Diff line number Diff line
@@ -1568,6 +1568,15 @@ final class FragmentManagerImpl extends FragmentManager { 
        for (int i=0; i<N; i++) {

            Fragment f = mActive.get(i);

            if (f != null) {

                if (f.mIndex < 0) {

                    String msg = "Failure saving state: active " + f

                            + " has cleared index: " + f.mIndex;

                    Slog.e(TAG, msg);

                    dump("  ", null, new PrintWriter(new LogWriter(

                            Log.ERROR, TAG, Log.LOG_ID_SYSTEM)), new String[] { });

                    throw new IllegalStateException(msg);

                }



                haveFragments = true;



                FragmentState fs = new FragmentState(f);
@@ -1621,6 +1630,14 @@ final class FragmentManagerImpl extends FragmentManager { 
                added = new int[N];

                for (int i=0; i<N; i++) {

                    added[i] = mAdded.get(i).mIndex;

                    if (added[i] < 0) {

                        String msg = "Failure saving state: active " + mAdded.get(i)

                                + " has cleared index: " + added[i];

                        Slog.e(TAG, msg);

                        dump("  ", null, new PrintWriter(new LogWriter(

                                Log.ERROR, TAG, Log.LOG_ID_SYSTEM)), new String[] { });

                        throw new IllegalStateException(msg);

                    }

                    if (DEBUG) Log.v(TAG, "saveAllState: adding fragment #" + i

                            + ": " + mAdded.get(i));

                }