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

Commit 6b0f1e78 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #22843150: fragment transaction crash from... 

Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
parents da493aa6 6bdd3a15

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3412,6 +3412,7 @@ package android.app { 
    method public boolean onSearchRequested(android.view.SearchEvent);

    method public boolean onSearchRequested();

    method protected void onStart();

    method public void onStateNotSaved();

    method protected void onStop();

    method protected void onTitleChanged(java.lang.CharSequence, int);

    method public boolean onTouchEvent(android.view.MotionEvent);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3516,6 +3516,7 @@ package android.app { 
    method public boolean onSearchRequested(android.view.SearchEvent);

    method public boolean onSearchRequested();

    method protected void onStart();

    method public void onStateNotSaved();

    method protected void onStop();

    method protected void onTitleChanged(java.lang.CharSequence, int);

    method public boolean onTouchEvent(android.view.MotionEvent);

core/java/android/app/Activity.java

+10 −0
Original line number Diff line number Diff line
@@ -1171,6 +1171,16 @@ public class Activity extends ContextThemeWrapper 
        mCalled = true;

    }



    /**

     * Called when an {@link #onResume} is coming up, prior to other pre-resume callbacks

     * such as {@link #onNewIntent} and {@link #onActivityResult}.  This is primarily intended

     * to give the activity a hint that its state is no longer saved -- it will generally

     * be called after {@link #onSaveInstanceState} and prior to the activity being

     * resumed/started again.

     */

    public void onStateNotSaved() {

    }



    /**

     * Called after {@link #onRestoreInstanceState}, {@link #onRestart}, or

     * {@link #onPause}, for your activity to start interacting with the user.

core/java/android/app/ActivityThread.java

+1 −0
Original line number Diff line number Diff line
@@ -3079,6 +3079,7 @@ public final class ActivityThread { 
                r.activity.mStartedActivity = false;

            }

            try {

                r.activity.onStateNotSaved();

                r.activity.mFragments.noteStateNotSaved();

                if (r.pendingIntents != null) {

                    deliverNewIntents(r, r.pendingIntents);