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

* commit 'e33010a261d881426ce0af9a9e2177137ec3f6b9':
  Add NO_ANIMATION flag to ActivityView Intents.
This commit is contained in:
Craig Mautner
2014-06-11 17:42:06 +00:00
committed by Android Git Automerger

View File

@@ -2956,7 +2956,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
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;