From a28e8cc50ffa37cd739518b34985e21ca88466d8 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Sat, 9 Apr 2016 00:29:07 -0700 Subject: [PATCH] Do not transfer starting window to translucent activity When starting the "App may not work in split-screen" activity which is translucent we used to transfer the starting window, and then the frame was drawn quickly so the starting window from the behind was removed, leading to a black hole. Bug: 28094732 Change-Id: I828f0ea8b0465a5a113fd76a82d33177c8faa566 --- .../server/wm/WindowManagerService.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 40ae65249ada1..9088522dfa8e2 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -3940,16 +3940,6 @@ public class WindowManagerService extends IWindowManager.Stub return; } - if (transferStartingWindow(transferFrom, wtoken)) { - return; - } - - // There is no existing starting window, and the caller doesn't - // want us to create one, so that's it! - if (!createIfNeeded) { - return; - } - // If this is a translucent window, then don't // show a starting window -- the current effect (a full-screen // opaque starting window that fades away to the real contents @@ -3995,6 +3985,16 @@ public class WindowManagerService extends IWindowManager.Stub } } + if (transferStartingWindow(transferFrom, wtoken)) { + return; + } + + // There is no existing starting window, and the caller doesn't + // want us to create one, so that's it! + if (!createIfNeeded) { + return; + } + if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM, "Creating StartingData"); wtoken.startingData = new StartingData(pkg, theme, compatInfo, nonLocalizedLabel, labelRes, icon, logo, windowFlags);