From 78d7c6509a93342949bc50bb1d82886a58c3ef1e Mon Sep 17 00:00:00 2001 From: Jay Aliomer Date: Tue, 28 Jan 2020 11:42:18 -0500 Subject: [PATCH] Activity Record Splash Screen When going to the home screen, the activity does not need a splash screen Test: run activity record test Change-Id: Ic5cd747f69e9b6c332013455c779cd0b7860c477 --- .../java/com/android/server/wm/ActivityRecord.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 33e18c1263abf..80b807b71700b 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -1876,9 +1876,13 @@ 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 - : snapshotOrientationSameAsTask(snapshot) || fromRecents - ? STARTING_WINDOW_TYPE_SNAPSHOT : STARTING_WINDOW_TYPE_SPLASH_SCREEN; + if (snapshotOrientationSameAsTask(snapshot) || (snapshot != null && fromRecents)) { + return STARTING_WINDOW_TYPE_SNAPSHOT; + } + if (!isActivityTypeHome()) { + return STARTING_WINDOW_TYPE_SPLASH_SCREEN; + } + return STARTING_WINDOW_TYPE_NONE; } else { return STARTING_WINDOW_TYPE_NONE; }