diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-09 14:02:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-09 14:02:27 -0700 |
| commit | 3770003e84dcb51c9cd5ae87bbf18ef089b1409c (patch) | |
| tree | ba5f4ef8c7b39ee8abbcae2ac6196d5258f3fc4e | |
| parent | e310ca7a3affba41e6864a87e257b7811069f0a0 (diff) | |
| parent | bdf3dc1c95c203224a9a464fad6612e413a3597c (diff) | |
am bdf3dc1c: am 08c04000: Merge "Remove incorrect CLEAR_WHEN_TASK_RESET behavior." into jb-dev
* commit 'bdf3dc1c95c203224a9a464fad6612e413a3597c':
Remove incorrect CLEAR_WHEN_TASK_RESET behavior.
| -rwxr-xr-x | services/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 1e14f5b55974..c300411e965c 100755 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -1794,10 +1794,6 @@ final class ActivityStack { mService.mWindowManager.prepareAppTransition( WindowManagerPolicy.TRANSIT_NONE, keepCurTransition); mNoAnimActivities.add(r); - } else if ((r.intent.getFlags()&Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET) != 0) { - mService.mWindowManager.prepareAppTransition( - WindowManagerPolicy.TRANSIT_TASK_OPEN, keepCurTransition); - mNoAnimActivities.remove(r); } else { mService.mWindowManager.prepareAppTransition(newTask ? WindowManagerPolicy.TRANSIT_TASK_OPEN |