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

Commit 858cf036 authored by Adam Powell's avatar Adam Powell
Browse files

Move Activity multi-window event logic out of the public methods 

Move the logic for dispatching multi-window mode change events to
fragments and the activity window out of the public API onFoo methods
meant to be overridden by apps. This prevents problems if an extending
class forgets to call super.onFoo in these methods and removes the
need for doing so.

Bug 28667205

Change-Id: Ibf4c543e22b95753e1e4812bbd3e81f7648de54d
parent e981777f

core/java/android/app/Activity.java

+21 −11
Original line number Diff line number Diff line
@@ -1879,14 +1879,9 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param isInMultiWindowMode True if the activity is in multi-window mode.

     */

    @CallSuper

    public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {

        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "onMultiWindowModeChanged " + this + ": " + isInMultiWindowMode);

        mFragments.dispatchMultiWindowModeChanged(isInMultiWindowMode);

        if (mWindow != null) {

            mWindow.onMultiWindowModeChanged();

        }

        // Left deliberately empty. There should be no side effects if a direct

        // subclass of Activity does not call super.

    }



    /**
@@ -1909,11 +1904,9 @@ public class Activity extends ContextThemeWrapper 
     *

     * @param isInPictureInPictureMode True if the activity is in picture-in-picture mode.

     */

    @CallSuper

    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {

        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "onPictureInPictureModeChanged " + this + ": " + isInPictureInPictureMode);

        mFragments.dispatchPictureInPictureModeChanged(isInPictureInPictureMode);

        // Left deliberately empty. There should be no side effects if a direct

        // subclass of Activity does not call super.

    }



    /**
@@ -6875,6 +6868,23 @@ public class Activity extends ContextThemeWrapper 
        }

    }



    final void dispatchMultiWindowModeChanged(boolean isInMultiWindowMode) {

        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "dispatchMultiWindowModeChanged " + this + ": " + isInMultiWindowMode);

        mFragments.dispatchMultiWindowModeChanged(isInMultiWindowMode);

        if (mWindow != null) {

            mWindow.onMultiWindowModeChanged();

        }

        onMultiWindowModeChanged(isInMultiWindowMode);

    }



    final void dispatchPictureInPictureModeChanged(boolean isInPictureInPictureMode) {

        if (DEBUG_LIFECYCLE) Slog.v(TAG,

                "dispatchPictureInPictureModeChanged " + this + ": " + isInPictureInPictureMode);

        mFragments.dispatchPictureInPictureModeChanged(isInPictureInPictureMode);

        onPictureInPictureModeChanged(isInPictureInPictureMode);

    }



    /**

     * @hide

     */

core/java/android/app/ActivityThread.java

+2 −2
Original line number Diff line number Diff line
@@ -2905,14 +2905,14 @@ public final class ActivityThread { 
    private void handleMultiWindowModeChanged(IBinder token, boolean isInMultiWindowMode) {

        final ActivityClientRecord r = mActivities.get(token);

        if (r != null) {

            r.activity.onMultiWindowModeChanged(isInMultiWindowMode);

            r.activity.dispatchMultiWindowModeChanged(isInMultiWindowMode);

        }

    }



    private void handlePictureInPictureModeChanged(IBinder token, boolean isInPipMode) {

        final ActivityClientRecord r = mActivities.get(token);

        if (r != null) {

            r.activity.onPictureInPictureModeChanged(isInPipMode);

            r.activity.dispatchPictureInPictureModeChanged(isInPipMode);

        }

    }