From 63b99c9c855dbefdb341124291b3d549f62df99a Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Fri, 4 Mar 2022 11:43:25 +0800 Subject: [PATCH] Allow to show icon style splash screen when launched from Shell. Be used for CTS and launch with shell uid. Bug: 218485067 Test: atest SplashscreenTest Change-Id: I5ae1a8cb857ff0473edb48083399c460c5be0045 --- .../core/java/com/android/server/wm/ActivityRecord.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index e66f309d2cccf..7365f417bbd14 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -6669,7 +6669,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } // Choose the default behavior for Launcher and SystemUI when the SplashScreen style is // not specified in the ActivityOptions. - if (mLaunchSourceType == LAUNCH_SOURCE_TYPE_HOME) { + if (mLaunchSourceType == LAUNCH_SOURCE_TYPE_HOME + || launchedFromUid == Process.SHELL_UID) { return false; } else if (mLaunchSourceType == LAUNCH_SOURCE_TYPE_SYSTEMUI) { return true; @@ -6689,7 +6690,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // solid color splash screen. // Need to check sourceRecord before in case this activity is launched from service. return !startActivity || !(mLaunchSourceType == LAUNCH_SOURCE_TYPE_SYSTEM - || mLaunchSourceType == LAUNCH_SOURCE_TYPE_HOME); + || mLaunchSourceType == LAUNCH_SOURCE_TYPE_HOME + || launchedFromUid == Process.SHELL_UID); } private int getSplashscreenTheme(ActivityOptions options) {