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

Commit b4fb60f2 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Check SurfaceControl state while holding the WM lock" into main

parents f1469edf c9650671

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

+5 −4
Original line number Diff line number Diff line
@@ -8425,12 +8425,13 @@ public class WindowManagerService extends IWindowManager.Stub 
                SurfaceControlViewHost.SurfacePackage overlay) {

            if (overlay == null) {

                throw new IllegalArgumentException("Invalid overlay passed in for task=" + taskId);

            } else if (overlay.getSurfaceControl() == null

            }

            synchronized (mGlobalLock) {

                if (overlay.getSurfaceControl() == null

                        || !overlay.getSurfaceControl().isValid()) {

                    throw new IllegalArgumentException(

                            "Invalid overlay surfacecontrol passed in for task=" + taskId);

                }

            synchronized (mGlobalLock) {

                final Task task = mRoot.getRootTask(taskId);

                if (task == null) {

                    throw new IllegalArgumentException("no task with taskId" + taskId);