Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow to show icon style splash screen when launched from Shell.

Browse Source 
Be used for CTS and launch with shell uid.

Bug: 218485067
Test: atest SplashscreenTest
Change-Id: I5ae1a8cb857ff0473edb48083399c460c5be0045
This commit is contained in:
wilsonshih
2022-03-04 11:43:25 +08:00
committed by Wei Sheng Shih
parent 81eff37a33
commit 63b99c9c85
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -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) {