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

Commit 5cb681b9 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Jay Aliomer
Browse files

Revert "Revert "Performance regression when hot reloading"" 

This reverts commit 683379d6.

Reason for revert: b/146585515

Change-Id: I8cd03418c51e4dcacd292273e98198c335b865cf
parent 0ac93987

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_SPLASH_SCREEN

            return snapshot == null ? STARTING_WINDOW_TYPE_NONE

                    : snapshotOrientationSameAsTask(snapshot) || fromRecents

                            ? STARTING_WINDOW_TYPE_SNAPSHOT : STARTING_WINDOW_TYPE_SPLASH_SCREEN;

        } else {