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

Commit dd6ba7d3 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 888e1a2e: am 992ea042: Merge "Don\'t count finishing activities as... 

am 888e1a2e: am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev

* commit '888e1a2ec6208e923254fc223800af06aa051a20':
  Don't count finishing activities as effective activities.
parents 5749cc09 879c239d

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

+4 −3
Original line number Diff line number Diff line
@@ -781,18 +781,19 @@ final class TaskRecord { 
    }



    int findEffectiveRootIndex() {

        int activityNdx;

        int effectiveNdx = 0;

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

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

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

            final ActivityRecord r = mActivities.get(activityNdx);

            if (r.finishing) {

                continue;

            }

            effectiveNdx = activityNdx;

            if ((r.info.flags & ActivityInfo.FLAG_RELINQUISH_TASK_IDENTITY) == 0) {

                break;

            }

        }

        return activityNdx;

        return effectiveNdx;

    }



    void updateEffectiveIntent() {