From 20583ff9d49257bd4ccc60e7b6337661e34ed887 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Mon, 27 Jul 2009 21:51:05 -0700
Subject: [PATCH] Fix issue #2015611: layering problem when moving an activity
 to the foreground.

"surface of singleTop acitivy is not added at the top, causing the activity is resumed
behind the top activity."
---
 services/java/com/android/server/WindowManagerService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 49989451ac908..5a02c4d3330db 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -8179,7 +8179,9 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
                         // This has changed the visibility of windows, so perform
                         // a new layout to get them all up-to-date.
                         mLayoutNeeded = true;
-                        moveInputMethodWindowsIfNeededLocked(true);
+                        if (!moveInputMethodWindowsIfNeededLocked(true)) {
+                            assignLayersLocked();
+                        }
                         performLayoutLockedInner();
                         updateFocusedWindowLocked(UPDATE_FOCUS_PLACING_SURFACES);