commit 78d7c6509a93342949bc50bb1d82886a58c3ef1e
author Jay Aliomer <aaliomer@google.com> Tue Jan 28 11:42:18 2020 -0500
committer Jay Aliomer <aaliomer@google.com> Wed Jan 29 13:00:18 2020 -0500
tree beccf56ba7441bd74a67cf3fb8d639fda91bd241
parent a6983622520348d420a4aa6138561d350814a733

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

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

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 33e18c1..80b807b 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 @@
         } 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;
         }