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

Commit af0b74e9 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 

am: b148f83e

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

Change-Id: I4bf8510cb21e4f35f1a935f2885b14bc511c47ac
parents 726c1300 b148f83e

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 {