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

Commit 4423456d authored by Daichi Hirono's avatar Daichi Hirono Committed by Android (Google) Code Review
Browse files

Merge "Change deleteRootTasks so that it returns false instead of exception" into sc-dev

parents b21d3088 8770248f

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

+1 −3
Original line number Diff line number Diff line
@@ -596,9 +596,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
        try {

            synchronized (mGlobalLock) {

                final WindowContainer wc = WindowContainer.fromBinder(token.asBinder());

                if (wc == null) {

                    throw new IllegalArgumentException("Can't resolve window from token");

                }

                if (wc == null) return false;

                final Task task = wc.asTask();

                if (task == null) return false;

                if (!task.mCreatedByOrganizer) {