diff options
| author | 2012-05-09 13:55:52 -0700 | |
|---|---|---|
| committer | 2012-05-09 13:55:52 -0700 | |
| commit | 08c04000c6355a735dab237e1994dc17c7e5d44f (patch) | |
| tree | 3224552980f84efa5e205357d1ec48040816ca3e | |
| parent | c1fc0f01d2b0af2216870a40ae4cb6572588d194 (diff) | |
| parent | 9158cbcbc9895e476606c5191168ee4a6c67c9c7 (diff) | |
Merge "Remove incorrect CLEAR_WHEN_TASK_RESET behavior." into jb-dev
| -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 |