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

Commit 3e2af07f authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I8ff2422f834c0f62547079075fc06a64e0e6c411
parents 29cd6f01 f4690485

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");