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

Commit 4767f4b3 authored by Craig Mautner's avatar Craig Mautner
Browse files

Don't count finishing activities as effective activities. 

They were being counted as effectiveRoot even though they were
finishing.

Fixes bug 17550936.

Change-Id: Iaf7201e6150095e55f88344e4b257e4ae8f19a2b
parent c1e1550b

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

+4 −3
Original line number Diff line number Diff line
@@ -784,18 +784,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() {