Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3770003e authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am bdf3dc1c: am 08c04000: Merge "Remove incorrect CLEAR_WHEN_TASK_RESET behavior." into jb-dev 

* commit 'bdf3dc1c':
  Remove incorrect CLEAR_WHEN_TASK_RESET behavior.
parents e310ca7a bdf3dc1c

services/java/com/android/server/am/ActivityStack.java

+0 −4
Original line number Diff line number Diff line
@@ -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