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

Commit af1c7cfd authored by Tiger's avatar Tiger
Browse files

Refine the performance of updating the insets hint 

Previously, the insets hint was checked and updated every time in
InsetsSourceProvider#onPostLayout via setServerVisible. Most of them
were just checking but not updating. That still caused the regression of
performance.

This CL flags the insets hint as stale when the source frame or the
window container bounds is changed, and only updates the insets hints
when someone calls getInsetsHint().

Fix: 292177371
Test: atest InsetsSourceProviderTest
Test: Switch to 3-button navigation bar and reboot the device.
      Make sure the back button is not shown on the lockscreen.
Change-Id: I59e21581d7ca136d4e4eb8c1a442fc74a92914b7
parent 169e37cc

services/core/java/com/android/server/wm/InsetsSourceProvider.java

+26 −17
Original line number Original line Diff line number Diff line
@@ -81,8 +81,8 @@ class InsetsSourceProvider { 
    private boolean mIsLeashReadyForDispatching;

    private boolean mIsLeashReadyForDispatching;

    private final Rect mSourceFrame = new Rect();

    private final Rect mSourceFrame = new Rect();

    private final Rect mLastSourceFrame = new Rect();

    private final Rect mLastSourceFrame = new Rect();

    private final Rect mLastContainerBounds = new Rect();

    private @NonNull Insets mInsetsHint = Insets.NONE;

    private @NonNull Insets mInsetsHint = Insets.NONE;

    private boolean mInsetsHintStale = true;

    private @Flags int mFlagsFromFrameProvider;

    private @Flags int mFlagsFromFrameProvider;

    private @Flags int mFlagsFromServer;

    private @Flags int mFlagsFromServer;
@@ -238,6 +238,10 @@ class InsetsSourceProvider { 
            mSource.setFlags(mFlagsFromFrameProvider | mFlagsFromServer);

            mSource.setFlags(mFlagsFromFrameProvider | mFlagsFromServer);

        }

        }

        updateSourceFrameForServerVisibility();

        updateSourceFrameForServerVisibility();

        if (!mLastSourceFrame.equals(mSourceFrame)) {

            mLastSourceFrame.set(mSourceFrame);

            mInsetsHintStale = true;

        }





        if (mOverrideFrameProviders != null) {

        if (mOverrideFrameProviders != null) {

            // Not necessary to clear the mOverrideFrames here. It will be cleared every time the

            // Not necessary to clear the mOverrideFrames here. It will be cleared every time the
@@ -279,28 +283,29 @@ class InsetsSourceProvider { 
        // visible. (i.e. No surface, pending insets that were given during layout, etc..)

        // visible. (i.e. No surface, pending insets that were given during layout, etc..)

        if (mServerVisible) {

        if (mServerVisible) {

            mSource.setFrame(mSourceFrame);

            mSource.setFrame(mSourceFrame);

            updateInsetsHint();

        } else {

        } else {

            mSource.setFrame(0, 0, 0, 0);

            mSource.setFrame(0, 0, 0, 0);

        }

        }

    }

    }





    // To be called when mSourceFrame or the window container bounds is changed.

    void onWindowContainerBoundsChanged() {

    private void updateInsetsHint() {

        mInsetsHintStale = true;

        if (!mControllable || !mServerVisible) {

            return;

        }

        final Rect bounds = mWindowContainer.getBounds();

        if (mSourceFrame.equals(mLastSourceFrame) && bounds.equals(mLastContainerBounds)) {

            return;

        }

        mLastSourceFrame.set(mSourceFrame);

        mLastContainerBounds.set(bounds);

        mInsetsHint = mSource.calculateInsets(bounds, true /* ignoreVisibility */);

    }

    }





    @VisibleForTesting

    @VisibleForTesting

    Insets getInsetsHint() {

    Insets getInsetsHint() {

        if (!mServerVisible) {

            return mInsetsHint;

        }

        final WindowState win = mWindowContainer.asWindowState();

        if (win != null && win.mGivenInsetsPending) {

            return mInsetsHint;

        }

        if (mInsetsHintStale) {

            final Rect bounds = mWindowContainer.getBounds();

            mInsetsHint = mSource.calculateInsets(bounds, true /* ignoreVisibility */);

            mInsetsHintStale = false;

        }

        return mInsetsHint;

        return mInsetsHint;

    }

    }
@@ -359,8 +364,9 @@ class InsetsSourceProvider { 
                    mSetLeashPositionConsumer.accept(t);

                    mSetLeashPositionConsumer.accept(t);

                }

                }

            }

            }

            if (!mControl.getInsetsHint().equals(mInsetsHint)) {

            final Insets insetsHint = getInsetsHint();

                mControl.setInsetsHint(mInsetsHint);

            if (!mControl.getInsetsHint().equals(insetsHint)) {

                mControl.setInsetsHint(insetsHint);

                changed = true;

                changed = true;

            }

            }

            if (changed) {

            if (changed) {
@@ -494,7 +500,7 @@ class InsetsSourceProvider { 
        mControlTarget = target;

        mControlTarget = target;

        updateVisibility();

        updateVisibility();

        mControl = new InsetsSourceControl(mSource.getId(), mSource.getType(), leash,

        mControl = new InsetsSourceControl(mSource.getId(), mSource.getType(), leash,

                mClientVisible, surfacePosition, mInsetsHint);

                mClientVisible, surfacePosition, getInsetsHint());





        ProtoLog.d(WM_DEBUG_WINDOW_INSETS,

        ProtoLog.d(WM_DEBUG_WINDOW_INSETS,

                "InsetsSource Control %s for target %s", mControl, mControlTarget);

                "InsetsSource Control %s for target %s", mControl, mControlTarget);
@@ -605,6 +611,9 @@ class InsetsSourceProvider { 
        if (mControllable) {

        if (mControllable) {

            pw.print(prefix + "mInsetsHint=");

            pw.print(prefix + "mInsetsHint=");

            pw.print(mInsetsHint);

            pw.print(mInsetsHint);

            if (mInsetsHintStale) {

                pw.print(" stale");

            }

            pw.println();

            pw.println();

        }

        }

        pw.print(prefix);

        pw.print(prefix);

services/core/java/com/android/server/wm/WindowContainer.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -1143,6 +1143,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
    }

    }





    void onResize() {

    void onResize() {

        if (mControllableInsetProvider != null) {

            mControllableInsetProvider.onWindowContainerBoundsChanged();

        }

        for (int i = mChildren.size() - 1; i >= 0; --i) {

        for (int i = mChildren.size() - 1; i >= 0; --i) {

            final WindowContainer wc = mChildren.get(i);

            final WindowContainer wc = mChildren.get(i);

            wc.onParentResize();

            wc.onParentResize();
@@ -1162,6 +1165,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
    }

    }





    void onMovedByResize() {

    void onMovedByResize() {

        if (mControllableInsetProvider != null) {

            mControllableInsetProvider.onWindowContainerBoundsChanged();

        }

        for (int i = mChildren.size() - 1; i >= 0; --i) {

        for (int i = mChildren.size() - 1; i >= 0; --i) {

            final WindowContainer wc = mChildren.get(i);

            final WindowContainer wc = mChildren.get(i);

            wc.onMovedByResize();

            wc.onMovedByResize();