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
This commit is contained in:
Olawale Ogunwale
2014-12-19 15:46:45 +00:00
committed by android-build-merger

View File

@@ -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) {