summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ming-Shin Lu <lumark@google.com> 2020-12-08 14:58:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-08 14:58:16 +0000
commitda2f5662aef1bdc10ea176b0a1abcf82d3993acb (patch)
tree45b063d669611fbf60c2d6a587cd93ad6e59bd92
parent709503fb95d4822afce01c6c1d26a5d4327f400e (diff)
parent9dce71fe0a0f8acb07bf42c9047db79a17b1ec30 (diff)
Merge "Revert "Ignore to show splash screen if the decorView is not opaque"" into rvc-qpr-dev am: 132a346318 am: 9dce71fe0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13178636 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib1220d3d5e184e5701d9fe8e4e978d3aa2955bb8
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java9
1 files changed, 0 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 75868e3216cc..ea985df1c6b8 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -2413,15 +2413,6 @@ 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));