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

Commit d9d0c2a8 authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "[wm] fix npe when removing trusted task overlays" into udc-qpr-dev am: b6a07bea 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23481001



Change-Id: I4c1b1e0307312c73bbde446ff3b60d8cbb98cfa7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6804e155 b6a07bea

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

+14 −0
Original line number Diff line number Diff line
@@ -8270,6 +8270,13 @@ public class WindowManagerService extends IWindowManager.Stub 
        @Override

        public void addTrustedTaskOverlay(int taskId,

                SurfaceControlViewHost.SurfacePackage overlay) {

            if (overlay == null) {

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

            } else 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) {
@@ -8282,6 +8289,13 @@ public class WindowManagerService extends IWindowManager.Stub 
        @Override

        public void removeTrustedTaskOverlay(int taskId,

                SurfaceControlViewHost.SurfacePackage overlay) {

            if (overlay == null) {

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

            } else 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) {