Projects >> platform_frameworks_base >>ca0aba399326886d1a39c2344bab296044ba5eb0

Chunk
Conflicting content
    final void setFrontOfTask() {
        boolean foundFront = false;
        final int numActivities = mActivities.size();
<<<<<<< HEAD:services/core/java/com/android/server/am/TaskRecord.java
        for (int activityNdx = 0; activityNdx < numActivities; ++activityNdx) {
=======
        for (int activityNdx = 0; numActivities < activityNdx; ++activityNdx) {
>>>>>>> 54d5702cf8e5e7d9fe5794f93b90b6f678ac27bb:services/java/com/android/server/am/TaskRecord.java
            final ActivityRecord r = mActivities.get(activityNdx);
            if (foundFront || r.finishing) {
                r.frontOfTask = false;
Solution content
    final void setFrontOfTask() {
        boolean foundFront = false;
        final int numActivities = mActivities.size();
        for (int activityNdx = 0; activityNdx < numActivities; ++activityNdx) {
            final ActivityRecord r = mActivities.get(activityNdx);
            if (foundFront || r.finishing) {
                r.frontOfTask = false;
File
TaskRecord.java
Developer's decision
Version 1
Kind of conflict
For statement