diff options
| author | Olawale Ogunwale <ogunwale@google.com> | 2014-12-19 15:46:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-19 15:46:45 +0000 |
| commit | 2d412c369f060a914da167f0cffa2d275cfbccee (patch) | |
| tree | 2c0995a15ea5aaf4b5711279435feaecd48e3257 | |
| parent | e387af1cd0342bca41072f3c3f3dcd5d712566b3 (diff) | |
| parent | 9079259054359e45b9616afaa799439c9171c0e2 (diff) | |
| download | frameworks_base-2d412c369f060a914da167f0cffa2d275cfbccee.zip frameworks_base-2d412c369f060a914da167f0cffa2d275cfbccee.tar.gz frameworks_base-2d412c369f060a914da167f0cffa2d275cfbccee.tar.bz2 | |
am 796a1773: am 4fa039df: Merge "Layout the config-changed window if it has surface"
automerge: 9079259
* commit '9079259054359e45b9616afaa799439c9171c0e2':
Layout the config-changed window if it has surface
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 1970e11..8ed6a31 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -8898,7 +8898,8 @@ public class WindowManagerService extends IWindowManager.Stub if (!gone || !win.mHaveFrame || win.mLayoutNeeded || ((win.isConfigChanged() || win.setInsetsChanged()) && ((win.mAttrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0 || - win.mAppToken != null && win.mAppToken.layoutConfigChanges)) + (win.mHasSurface && win.mAppToken != null && + win.mAppToken.layoutConfigChanges))) || win.mAttrs.type == TYPE_UNIVERSE_BACKGROUND) { if (!win.mLayoutAttached) { if (initial) { |