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

Commit c23d4830 authored by Daichi Hirono's avatar Daichi Hirono Committed by Automerger Merge Worker
Browse files

Merge "Change deleteRootTasks so that it returns false instead of exception"... 

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d7a912146ae1d6aaedbaa5001cdf4a344f4641a
parents 0fb77424 4423456d

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