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

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

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

* commit '992ea04287486759d1cc17a4f18ff96c15bc47c2':
  Don't count finishing activities as effective activities.
parents d137a27e 6920feed

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() {