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

Commit 2042446a authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Synchronize stack position and size update for split screen" into pi-dev am: 9553a115 

am: 5826a2a7

Change-Id: Ie8a24f3b8ae0c1fa1d9576118b1404e96dfe184c
parents 0e6647ad 5826a2a7

config/boot-image-profile.txt

+2 −2
Original line number Diff line number Diff line
@@ -32326,7 +32326,7 @@ HSPLandroid/view/IWindowSession$Stub$Proxy;->finishDrawing(Landroid/view/IWindow 
HSPLandroid/view/IWindowSession$Stub$Proxy;->getDisplayFrame(Landroid/view/IWindow;Landroid/graphics/Rect;)V

HSPLandroid/view/IWindowSession$Stub$Proxy;->getInTouchMode()Z

HSPLandroid/view/IWindowSession$Stub$Proxy;->onRectangleOnScreenRequested(Landroid/os/IBinder;Landroid/graphics/Rect;)V

HSPLandroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I

HSPLandroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I

HSPLandroid/view/IWindowSession$Stub$Proxy;->setInsets(Landroid/view/IWindow;ILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Region;)V

HSPLandroid/view/IWindowSession$Stub$Proxy;->setTransparentRegion(Landroid/view/IWindow;Landroid/graphics/Region;)V

HSPLandroid/view/IWindowSession$Stub$Proxy;->setWallpaperPosition(Landroid/os/IBinder;FFFF)V
@@ -32349,7 +32349,7 @@ HSPLandroid/view/IWindowSession;->performHapticFeedback(Landroid/view/IWindow;IZ 
HSPLandroid/view/IWindowSession;->pokeDrawLock(Landroid/os/IBinder;)V

HSPLandroid/view/IWindowSession;->prepareDrag(Landroid/view/IWindow;IIILandroid/view/Surface;)Landroid/os/IBinder;

HSPLandroid/view/IWindowSession;->prepareToReplaceWindows(Landroid/os/IBinder;Z)V

HSPLandroid/view/IWindowSession;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I

HSPLandroid/view/IWindowSession;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I

HSPLandroid/view/IWindowSession;->remove(Landroid/view/IWindow;)V

HSPLandroid/view/IWindowSession;->reportDropResult(Landroid/view/IWindow;Z)V

HSPLandroid/view/IWindowSession;->sendWallpaperCommand(Landroid/os/IBinder;Ljava/lang/String;IIILandroid/os/Bundle;Z)Landroid/os/Bundle;

config/hiddenapi-light-greylist.txt

+1 −1
Original line number Diff line number Diff line
@@ -2230,7 +2230,7 @@ Landroid/view/IWindowManager$Stub$Proxy;->getDockedStackSide()I 
Landroid/view/IWindowManager$Stub$Proxy;->getInitialDisplayDensity(I)I

Landroid/view/IWindowManager$Stub$Proxy;->hasNavigationBar()Z

Landroid/view/IWindowManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

Landroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I

Landroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I

Landroid/view/KeyCharacterMap$FallbackAction;->keyCode:I

Landroid/view/KeyCharacterMap$FallbackAction;->metaState:I

Landroid/view/KeyCharacterMap;-><init>(J)V

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

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

                    final int relayoutResult = mSession.relayout(

                        mWindow, mWindow.mSeq, mLayout, mWidth, mHeight,

                            View.VISIBLE, 0, mWinFrame, mOverscanInsets, mContentInsets,

                            View.VISIBLE, 0, -1, mWinFrame, mOverscanInsets, mContentInsets,

                            mVisibleInsets, mStableInsets, mOutsets, mBackdropFrame,

                            mDisplayCutout, mMergedConfiguration, mSurfaceHolder.mSurface);

core/java/android/view/IWindowSession.aidl

+2 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 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 outOverscanInsets Rect in which is placed the offsets from
@@ -96,7 +97,7 @@ interface IWindowSession { 
     */

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

            int requestedWidth, int requestedHeight, int viewVisibility,

            int flags, out Rect outFrame, out Rect outOverscanInsets,

            int flags, long frameNumber, out Rect outFrame, out Rect outOverscanInsets,

            out Rect outContentInsets, out Rect outVisibleInsets, out Rect outStableInsets,

            out Rect outOutsets, out Rect outBackdropFrame,

            out DisplayCutout.ParcelableWrapper displayCutout,

core/java/android/view/ViewRootImpl.java

+7 −7
Original line number Diff line number Diff line
@@ -6479,17 +6479,17 @@ public final class ViewRootImpl implements ViewParent, 
                    params.type = mOrigWindowType;

                }

            }

        }



        long frameNumber = -1;

        if (mSurface.isValid()) {

                params.frameNumber = mSurface.getNextFrameNumber();

            }

            frameNumber = mSurface.getNextFrameNumber();

        }



        int relayoutResult = mWindowSession.relayout(

                mWindow, mSeq, params,

        int relayoutResult = mWindowSession.relayout(mWindow, mSeq, params,

                (int) (mView.getMeasuredWidth() * appScale + 0.5f),

                (int) (mView.getMeasuredHeight() * appScale + 0.5f),

                viewVisibility, insetsPending ? WindowManagerGlobal.RELAYOUT_INSETS_PENDING : 0,

                (int) (mView.getMeasuredHeight() * appScale + 0.5f), viewVisibility,

                insetsPending ? WindowManagerGlobal.RELAYOUT_INSETS_PENDING : 0, frameNumber,

                mWinFrame, mPendingOverscanInsets, mPendingContentInsets, mPendingVisibleInsets,

                mPendingStableInsets, mPendingOutsets, mPendingBackDropFrame, mPendingDisplayCutout,

                mPendingMergedConfiguration, mSurface);