diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-06 23:22:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-06 23:22:12 +0000 |
| commit | c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952 (patch) | |
| tree | b301df6152ec2018c2b97be9b651fd9b1b5fd3de /services/java | |
| parent | def34eb775caf8eb56248d536ec56b39c47e4431 (diff) | |
| parent | f961b3c5b69da7a71382de65633aede3e16b661d (diff) | |
| download | frameworks_base-c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952.zip frameworks_base-c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952.tar.gz frameworks_base-c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952.tar.bz2 | |
Merge "Tweak test for layout." into klp-dev
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index a645c01..e1e9f5c 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -8269,7 +8269,8 @@ public class WindowManagerService extends IWindowManager.Stub // windows, since that means "perform layout as normal, // just don't display"). if (!gone || !win.mHaveFrame || win.mLayoutNeeded - || win.isConfigChanged() + || win.mAttrs.type == TYPE_KEYGUARD && win.isConfigChanged() + || mOpeningApps.contains(win.mAppToken) || win.mAttrs.type == TYPE_UNIVERSE_BACKGROUND) { if (!win.mLayoutAttached) { if (initial) { |