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

Commit 9d4ee87e authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 6a661bbd: am cddaf1fd: am 528e8bc6: am 559e3516: am 14e957ee: Merge "Fix... 

am 6a661bbd: am cddaf1fd: am 528e8bc6: am 559e3516: am 14e957ee: Merge "Fix issue #17307700: retarget a relinquished task is not working" into lmp-dev

* commit '6a661bbd2c4c65081e19836bfa0c4a0d0766d0b4':
  Fix issue #17307700: retarget a relinquished task is not working
parents a30fcc2f b9fe2bfc

services/core/java/com/android/server/am/TaskRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ final class TaskRecord { 
    int findEffectiveRootIndex() {

        int effectiveNdx = 0;

        final int topActivityNdx = mActivities.size() - 1;

        for (int activityNdx = 0; activityNdx < topActivityNdx; ++activityNdx) {

        for (int activityNdx = 0; activityNdx <= topActivityNdx; ++activityNdx) {

            final ActivityRecord r = mActivities.get(activityNdx);

            if (r.finishing) {

                continue;