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

Commit e02adc28 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:... 

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

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



Change-Id: Icb5e45e54542145c68f94d153b5eddb2ae9daa5c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4ba65b9 d9d0c2a8

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

+14 −0
Original line number Diff line number Diff line
@@ -8246,6 +8246,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) {
@@ -8258,6 +8265,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) {