Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b658f7eb05e5b1e923126b276f86b1bf4fdc6ea
This commit is contained in:
Daichi Hirono
2021-02-25 00:45:13 +00:00
committed by Automerger Merge Worker
parent ff3321915d 4423456dd9
commit 83474cbf84
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/TaskOrganizerController.java
View File

@@ -596,9 +596,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
try { try {
synchronized (mGlobalLock) { synchronized (mGlobalLock) {
final WindowContainer wc = WindowContainer.fromBinder(token.asBinder()); final WindowContainer wc = WindowContainer.fromBinder(token.asBinder());
if (wc == null) { if (wc == null) return false;
throw new IllegalArgumentException("Can't resolve window from token");
}
final Task task = wc.asTask(); final Task task = wc.asTask();
if (task == null) return false; if (task == null) return false;
if (!task.mCreatedByOrganizer) { if (!task.mCreatedByOrganizer) {