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

Commit 683379d6 authored by Jay Aliomer's avatar Jay Aliomer
Browse files

Revert "Performance regression when hot reloading" 

This reverts commit c6cf9e3f.

Reason for revert: unrelated to the bug
Test: atest ActivityRecordTests

Change-Id: Iaa9f06102eabf4399401c73bd126a92549cd7acd
parent c261dd4f

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

+1 −1
Original line number Diff line number Diff line
@@ -1800,7 +1800,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 {