diff options
| author | Craig Mautner <cmautner@google.com> | 2012-10-10 15:38:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 15:38:58 -0700 |
| commit | 0a75ed0805dd7f97ff058623eb8e4f4b258c44ab (patch) | |
| tree | 49d193b998e46e4c9fa29fd943ac5144eed354e4 /services/java/com/android/server | |
| parent | f864401cfa1fdf863003f9d2d624fd742f7b5f4b (diff) | |
| parent | 64ecc0e1015f1c6c1f949bb74ba3f0875178c737 (diff) | |
| download | frameworks_base-0a75ed0805dd7f97ff058623eb8e4f4b258c44ab.zip frameworks_base-0a75ed0805dd7f97ff058623eb8e4f4b258c44ab.tar.gz frameworks_base-0a75ed0805dd7f97ff058623eb8e4f4b258c44ab.tar.bz2 | |
Merge "Revert "Remove debugging statements before final ROM."" into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server')
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index e37d00d..54f6deb 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -2752,7 +2752,10 @@ public class WindowManagerService extends IWindowManager.Stub } } - if (DEBUG_LAYOUT) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility + if (DEBUG_LAYOUT + // TODO: Remove once b/7094175 is fixed + || ((String)win.mAttrs.getTitle()).contains("Keyguard") + ) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility + " " + requestedWidth + "x" + requestedHeight + " " + win.mAttrs); win.mEnforceSizeCompat = (win.mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0; @@ -9272,7 +9275,9 @@ public class WindowManagerService extends IWindowManager.Stub "Reporting new frame to " + win + ": " + win.mCompatFrame); int diff = 0; boolean configChanged = win.isConfigChanged(); - if ((DEBUG_RESIZE || DEBUG_ORIENTATION || DEBUG_CONFIGURATION) + if ((DEBUG_RESIZE || DEBUG_ORIENTATION || DEBUG_CONFIGURATION + // TODO: Remove once b/7094175 is fixed + || ((String)win.mAttrs.getTitle()).contains("Keyguard")) && configChanged) { Slog.i(TAG, "Sending new config to window " + win + ": " + winAnimator.mSurfaceW + "x" + winAnimator.mSurfaceH |