summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-11-04 19:25:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-04 19:25:37 +0000
commit7f0d5c6d06f9ac93f67702d1a498fb9e3e3ee40c (patch)
tree69fd25ea06c3f350fa11d9aebc8fcbf28fbd759d
parent1023c6dc9d6565f919349cf0da922360028b2c1c (diff)
parentd23f4668bec62a769c25f85eedeea9238510cf09 (diff)
Merge "Ignore to show splash screen if the decorView is not opaque" into rvc-qpr-dev am: 4af61d89cf am: d23f4668be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12935197 Change-Id: I5e880748372ce49ab2e07e675d69cd583afaebdc
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 8b677a99b22a..fcba5cea6d85 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -2429,6 +2429,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
wm = (WindowManager) context.getSystemService(WINDOW_SERVICE);
view = win.getDecorView();
+ // Ignore to show splash screen if the decorView is not opaque.
+ if (!view.isOpaque()) {
+ if (DEBUG_SPLASH_SCREEN) {
+ Slog.d(TAG, "addSplashScreen: the view of " + packageName
+ + " is not opaque, cancel it");
+ }
+ return null;
+ }
+
if (DEBUG_SPLASH_SCREEN) Slog.d(TAG, "Adding splash screen window for "
+ packageName + " / " + appToken + ": " + (view.getParent() != null ? view : null));