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

Commit d8af6469 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set isInPictureInPictureMode and isInMultiWindowMode before dispatching callbacks" into main

parents 16994368 4da92edd

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -9291,11 +9291,11 @@ public class Activity extends ContextThemeWrapper 
        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "dispatchMultiWindowModeChanged " + this + ": " + isInMultiWindowMode

                        + " " + newConfig);

        mIsInMultiWindowMode = isInMultiWindowMode;

        mFragments.dispatchMultiWindowModeChanged(isInMultiWindowMode, newConfig);

        if (mWindow != null) {

            mWindow.onMultiWindowModeChanged();

        }

        mIsInMultiWindowMode = isInMultiWindowMode;

        onMultiWindowModeChanged(isInMultiWindowMode, newConfig);

    }
@@ -9304,11 +9304,11 @@ public class Activity extends ContextThemeWrapper 
        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "dispatchPictureInPictureModeChanged " + this + ": " + isInPictureInPictureMode

                        + " " + newConfig);

        mIsInPictureInPictureMode = isInPictureInPictureMode;

        mFragments.dispatchPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);

        if (mWindow != null) {

            mWindow.onPictureInPictureModeChanged(isInPictureInPictureMode);

        }

        mIsInPictureInPictureMode = isInPictureInPictureMode;

        onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);

    }