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

Commit dc94a722 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Remove the frame number from WindowManagerService"

parents a2af0942 96c3e87e

apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java

+1 −2
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase 


        final IntSupplier mViewVisibility;



        int mFrameNumber;

        int mFlags;



        RelayoutRunner(Activity activity, IWindow window, IntSupplier visibilitySupplier) {
@@ -153,7 +152,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase 
            final IWindowSession session = WindowManagerGlobal.getWindowSession();

            while (state.keepRunning()) {

                session.relayout(mWindow, mParams, mWidth, mHeight,

                        mViewVisibility.getAsInt(), mFlags, mFrameNumber, mOutFrames,

                        mViewVisibility.getAsInt(), mFlags, mOutFrames,

                        mOutMergedConfiguration, mOutSurfaceControl, mOutInsetsState, mOutControls);

            }

        }

core/java/android/service/wallpaper/WallpaperService.java

+1 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ public abstract class WallpaperService extends Service { 


                    final int relayoutResult = mSession.relayout(

                            mWindow, mLayout, mWidth, mHeight,

                            View.VISIBLE, 0, -1, mWinFrames, mMergedConfiguration, mSurfaceControl,

                            View.VISIBLE, 0, mWinFrames, mMergedConfiguration, mSurfaceControl,

                            mInsetsState, mTempControls);



                    final int transformHint = SurfaceControl.rotationToBufferTransform(

core/java/android/view/IWindowSession.aidl

+1 −2
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ interface IWindowSession { 
     * @param viewVisibility Window root view's visibility.

     * @param flags Request flags: {@link WindowManagerGlobal#RELAYOUT_INSETS_PENDING},

     * {@link WindowManagerGlobal#RELAYOUT_DEFER_SURFACE_DESTROY}.

     * @param frameNumber A frame number in which changes requested in this layout will be rendered.

     * @param outFrame Rect in which is placed the new position/size on

     * screen.

     * @param outContentInsets Rect in which is placed the offsets from
@@ -103,7 +102,7 @@ interface IWindowSession { 
     */

    int relayout(IWindow window, in WindowManager.LayoutParams attrs,

            int requestedWidth, int requestedHeight, int viewVisibility,

            int flags, long frameNumber, out ClientWindowFrames outFrames,

            int flags, out ClientWindowFrames outFrames,

            out MergedConfiguration outMergedConfiguration, out SurfaceControl outSurfaceControl,

            out InsetsState insetsState, out InsetsSourceControl[] activeControls);

core/java/android/view/ViewRootImpl.java

+1 −6
Original line number Diff line number Diff line
@@ -7933,14 +7933,9 @@ public final class ViewRootImpl implements ViewParent, 
        final int requestedWidth = (int) (mView.getMeasuredWidth() * appScale + 0.5f);

        final int requestedHeight = (int) (mView.getMeasuredHeight() * appScale + 0.5f);



        long frameNumber = -1;

        if (mSurface.isValid()) {

            frameNumber = mSurface.getNextFrameNumber();

        }



        int relayoutResult = mWindowSession.relayout(mWindow, params,

                requestedWidth, requestedHeight, viewVisibility,

                insetsPending ? WindowManagerGlobal.RELAYOUT_INSETS_PENDING : 0, frameNumber,

                insetsPending ? WindowManagerGlobal.RELAYOUT_INSETS_PENDING : 0,

                mTmpFrames, mPendingMergedConfiguration, mSurfaceControl, mTempInsets,

                mTempControls);

core/java/android/view/WindowlessWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ public class WindowlessWindowManager implements IWindowSession { 


    @Override

    public int relayout(IWindow window, WindowManager.LayoutParams inAttrs,

            int requestedWidth, int requestedHeight, int viewFlags, int flags, long frameNumber,

            int requestedWidth, int requestedHeight, int viewFlags, int flags,

            ClientWindowFrames outFrames, MergedConfiguration mergedConfiguration,

            SurfaceControl outSurfaceControl, InsetsState outInsetsState,

            InsetsSourceControl[] outActiveControls) {