Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63b99c9c authored by wilsonshih's avatar wilsonshih Committed by Wei Sheng Shih
Browse files

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
parent 81eff37a

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

+4 −2
Original line number Diff line number Diff line
@@ -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) {