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

2021-02-25 00:23:30 +00:00
parent b21d30888b 8770248f77
commit 4423456dd9
1 changed files with 1 additions and 3 deletions
--- a/services/core/java/com/android/server/wm/TaskOrganizerController.java
+++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java
@@ -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) {