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

Commit 0d548431 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Report task id for a finishing root activity" into main

parents 6ef417c5 e20a35dd

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

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
            }

            final Task task = r.getTask();

            if (onlyRoot) {

                return task.getRootActivity() == r ? task.mTaskId : INVALID_TASK_ID;

                return r.isRootOfTask() ? task.mTaskId : INVALID_TASK_ID;

            }

            return task.mTaskId;

        }

services/tests/wmtests/src/com/android/server/wm/TaskTests.java

+3 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,9 @@ public class TaskTests extends WindowTestsBase { 
        activity1.finishing = true;



        assertNull("No activity must be reported if all are finishing", task.getRootActivity());

        assertEquals("The task id of finishing root activity must be reported.",

                task.mTaskId, mAtm.mActivityClientController.getTaskForActivity(

                        activity0.token, true /* onlyRoot */));

    }



    /**