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

Merge "Allow to show icon style splash screen when launched from Shell." into tm-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2022-03-09 02:34:45 +00:00
committed by Android (Google) Code Review
parent 4ab407e5fe 63b99c9c85
commit 9b30f9e9e9
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

@@ -6767,7 +6767,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;
@@ -6787,7 +6788,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) {