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

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

Merge "Performance regression when hot reloading"

parents ef1db84b c6cf9e3f

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

+1 −1
Original line number Diff line number Diff line
@@ -1804,7 +1804,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                // task snapshot starting window.

                return STARTING_WINDOW_TYPE_SPLASH_SCREEN;

            }

            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 {