commit 9fb50954e15b8e6a96b08ebbac0e92fffc5ac8fe
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 05 18:03:49 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 05 18:03:54 2017 +0000
tree 811eb9b33ebd312a2d8763e62aa055bf61f53482
parent dc4fc1ebc2d22f9e12eba36d0527c115be812ec6
parent e0c3d5dd26afea46d3059d30ece80420ab6b80c6

Merge "Fixing regression in what is considered a restart attempt" into oc-dev

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

diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index 6d6f33d..e33ae0d 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -577,7 +577,7 @@
         }
 
         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