Set isInPictureInPictureMode and isInMultiWindowMode before dispatching callbacks

Sets the values for isInPictureInPictureMode and isInMultiWindowMode before
dispatching callbacks so that calls to isInPictureInPictureMode and
isInMultiWindowMode return the proper value.

Bug: 335678264
Test: verify (isInPictureInPictureMode == isInPictureInPictureMode()) == true
Change-Id: I4c8ede3c38c4638052b675d76c198fad7e4f517d

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index a5dd4a7207c3..0687fba5c6b2 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -9285,11 +9285,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);
     }
 
@@ -9298,11 +9298,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);
     }