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

Commit e7ef5a31 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove owerUid from WindowSurfaceController constructor"

parents 8eea08cb 30b5abe5

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

+1 −1
Original line number Diff line number Diff line
@@ -2575,7 +2575,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        WindowSurfaceController surfaceController;

        try {

            Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "createSurfaceControl");

            surfaceController = winAnimator.createSurfaceLocked(win.mAttrs.type, win.mOwnerUid);

            surfaceController = winAnimator.createSurfaceLocked(win.mAttrs.type);

        } finally {

            Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ class WindowStateAnimator { 
        }

    }



    WindowSurfaceController createSurfaceLocked(int windowType, int ownerUid) {

    WindowSurfaceController createSurfaceLocked(int windowType) {

        final WindowState w = mWin;



        if (mSurfaceController != null) {
@@ -480,7 +480,7 @@ class WindowStateAnimator { 
            }



            mSurfaceController = new WindowSurfaceController(attrs.getTitle().toString(), width,

                    height, format, flags, this, windowType, ownerUid);

                    height, format, flags, this, windowType);

            mSurfaceController.setColorSpaceAgnostic((attrs.privateFlags

                    & WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC) != 0);

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

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ class WindowSurfaceController { 
    boolean mChildrenDetached;



    WindowSurfaceController(String name, int w, int h, int format,

            int flags, WindowStateAnimator animator, int windowType, int ownerUid) {

            int flags, WindowStateAnimator animator, int windowType) {

        mAnimator = animator;



        mSurfaceW = w;
@@ -104,7 +104,7 @@ class WindowSurfaceController { 
                .setFormat(format)

                .setFlags(flags)

                .setMetadata(METADATA_WINDOW_TYPE, windowType)

                .setMetadata(METADATA_OWNER_UID, ownerUid)

                .setMetadata(METADATA_OWNER_UID, mWindowSession.mUid)

                .setMetadata(METADATA_OWNER_PID, mWindowSession.mPid)

                .setCallsite("WindowSurfaceController");