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

Commit 5afcd4df authored by Craig Mautner's avatar Craig Mautner
Browse files

resolved conflicts for merge of aaadf922 to master 

Change-Id: I8b89a326453fc8827a84eb9516271d2bf3b71e2c
parents a88738ff aaadf922

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -114,6 +114,10 @@ final class TaskRecord extends ThumbnailHolder { 
    /** If original intent did not allow relinquishing task identity, save that information */

    /** If original intent did not allow relinquishing task identity, save that information */

    boolean mNeverRelinquishIdentity = true;

    boolean mNeverRelinquishIdentity = true;





    // Used in the unique case where we are clearing the task in order to reuse it. In that case we

    // do not want to delete the stack when the task goes empty.

    boolean mReuseTask = false;



    final ActivityManagerService mService;

    final ActivityManagerService mService;





    TaskRecord(ActivityManagerService service, int _taskId, ActivityInfo info, Intent _intent,

    TaskRecord(ActivityManagerService service, int _taskId, ActivityInfo info, Intent _intent,
@@ -339,7 +343,7 @@ final class TaskRecord extends ThumbnailHolder { 
            mService.notifyTaskPersisterLocked(this, false);

            mService.notifyTaskPersisterLocked(this, false);

        }

        }

        if (mActivities.isEmpty()) {

        if (mActivities.isEmpty()) {

            return true;

            return !mReuseTask;

        }

        }

        updateEffectiveIntent();

        updateEffectiveIntent();

        return false;

        return false;
@@ -383,7 +387,9 @@ final class TaskRecord extends ThumbnailHolder { 
     * Completely remove all activities associated with an existing task.

     * Completely remove all activities associated with an existing task.

     */

     */

    final void performClearTaskLocked() {

    final void performClearTaskLocked() {

        mReuseTask = true;

        performClearTaskAtIndexLocked(0);

        performClearTaskAtIndexLocked(0);

        mReuseTask = false;

    }

    }





    /**

    /**