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

Commit b148f83e authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge "Fix Activity Transition mess-up." into nyc-dev 

am: bd34103c

* commit 'bd34103c':
  Fix Activity Transition mess-up.

Change-Id: I3c0785fa6a862d41210b124ab8836c0594990457
parents a8687234 bd34103c

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -5948,7 +5948,7 @@ public class Activity extends ContextThemeWrapper 
     * @return true if this is the topmost, non-finishing activity in its task.

     */

    private boolean isTopOfTask() {

        if (mToken == null || mWindow == null || !mWindowAdded) {

        if (mToken == null || mWindow == null) {

            return false;

        }

        try {