commit 28084383c13660864f75452f99183c377c2798ec
author Craig Mautner <cmautner@google.com> Wed Jun 11 17:42:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 11 17:42:06 2014 +0000
tree 5d2385081574027f8e22642c3c40255aec6d5315
parent cdd1fd7a8f88e6d99e773b2fb867dbf1d6c64eb9
parent e33010a261d881426ce0af9a9e2177137ec3f6b9

am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev

* commit 'e33010a261d881426ce0af9a9e2177137ec3f6b9':
  Add NO_ANIMATION flag to ActivityView Intents.

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

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 5a79e66..ed6a8bb 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2956,7 +2956,7 @@
 
     class ActivityContainer extends android.app.IActivityContainer.Stub {
         final static int FORCE_NEW_TASK_FLAGS = Intent.FLAG_ACTIVITY_NEW_TASK |
-                Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
+                Intent.FLAG_ACTIVITY_MULTIPLE_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION;
         final int mStackId;
         IActivityContainerCallback mCallback = null;
         final ActivityStack mStack;