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

Commit 0cd16c05 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fixing regression in what is considered a restart attempt" into oc-dev am: 9fb50954 

am: 3c9e0d42

Change-Id: I46bbb4746b4c1d8e379e4879733f83f227bb7963
parents 1a845c2e 3c9e0d42

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

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ class ActivityStarter { 
        }



        boolean clearedTask = (mLaunchFlags & (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK))

                == (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);

                == (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK) && (mReuseTask != null);

        if (startedActivityStackId == PINNED_STACK_ID && (result == START_TASK_TO_FRONT

                || result == START_DELIVERED_TO_TOP || clearedTask)) {

            // The activity was already running in the pinned stack so it wasn't started, but either