Merge change I8e7f5f07 into eclair
* changes:
DO NOT MERGE: Fix loss of focus after wakeup into incall screen
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index cd6a371..6418901 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -9303,6 +9303,15 @@
& WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER) != 0) {
wallpaperMayChange = true;
}
+ if (changed && !forceHiding
+ && (mCurrentFocus == null)
+ && (mFocusedApp != null)) {
+ // It's possible that the last focus recalculation left no
+ // current focused window even though the app has come to the
+ // foreground already. In this case, we make sure to recalculate
+ // focus when we show a window.
+ focusMayChange = true;
+ }
}
mPolicy.animatingWindowLw(w, attrs);