From 90cf76a2408793fb77c676b7a5430c293a87ecab Mon Sep 17 00:00:00 2001
From: wilsonshih <wilsonshih@google.com>
Date: Mon, 25 Apr 2022 11:44:30 +0800
Subject: [PATCH] Ensure the splash screen launched from system ui must be
 solid color.

Core may lose the launch source when launch with pending intent.

Bug: 215262680
Bug: 204414989
Test: verify always shows solid color splash screen when lauch activity
from system ui.

Change-Id: I187574ecaeadc73d856256cfeebe214c8b76e841
---
 .../com/android/systemui/statusbar/phone/CentralSurfaces.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
index 5e81b5da24558..f3510949ae0ad 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
@@ -110,6 +110,7 @@ import android.view.WindowManager;
 import android.view.WindowManagerGlobal;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.DateTimeView;
+import android.window.SplashScreen;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.Lifecycle;
@@ -4096,6 +4097,7 @@ public class CentralSurfaces extends CoreStartable implements
         } else {
             options = ActivityOptions.makeBasic();
         }
+        options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
         return options;
     }