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

Commit b0e33110 authored by Jay Aliomer's avatar Jay Aliomer Committed by Android (Google) Code Review
Browse files

Merge "Revert "Performance regression when hot reloading""

parents f81a6cf6 683379d6

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -1811,7 +1811,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        } else if (newTask || !processRunning || (taskSwitch && !activityCreated)) {

            return STARTING_WINDOW_TYPE_SPLASH_SCREEN;

        } else if (taskSwitch && allowTaskSnapshot) {

            return snapshot == null ? STARTING_WINDOW_TYPE_NONE

            return snapshot == null ? STARTING_WINDOW_TYPE_SPLASH_SCREEN

                    : snapshotOrientationSameAsTask(snapshot) || fromRecents

                            ? STARTING_WINDOW_TYPE_SNAPSHOT : STARTING_WINDOW_TYPE_SPLASH_SCREEN;

        } else {