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

Commit f4690485 authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Prevent having empty task added back into TDA" into sc-dev

parents 28a77d58 61076ae0

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

+2 −1
Original line number Diff line number Diff line
@@ -5604,7 +5604,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        @Override

        public ActivityTokens getTopActivityForTask(int taskId) {

            synchronized (mGlobalLock) {

                final Task task = mRootWindowContainer.anyTaskForId(taskId);

                final Task task = mRootWindowContainer.anyTaskForId(taskId,

                        MATCH_ATTACHED_TASK_ONLY);

                if (task == null) {

                    Slog.w(TAG, "getApplicationThreadForTopActivity failed:"

                            + " Requested task not found");