am 796a1773: am 4fa039df: Merge "Layout the config-changed window if it has surface"

* commit '796a1773070fd13eca07bc4919f1c7cdf2d8a8e7':
  Layout the config-changed window if it has surface
This commit is contained in:
Olawale Ogunwale
2014-12-19 15:42:46 +00:00
committed by Android Git Automerger

View File

@@ -8898,7 +8898,8 @@ public class WindowManagerService extends IWindowManager.Stub
if (!gone || !win.mHaveFrame || win.mLayoutNeeded if (!gone || !win.mHaveFrame || win.mLayoutNeeded
|| ((win.isConfigChanged() || win.setInsetsChanged()) && || ((win.isConfigChanged() || win.setInsetsChanged()) &&
((win.mAttrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0 || ((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) { || win.mAttrs.type == TYPE_UNIVERSE_BACKGROUND) {
if (!win.mLayoutAttached) { if (!win.mLayoutAttached) {
if (initial) { if (initial) {