From 64ecc0e1015f1c6c1f949bb74ba3f0875178c737 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Wed, 10 Oct 2012 13:22:10 -0700 Subject: [PATCH] Revert "Remove debugging statements before final ROM." The bug cropped up again. Need these statements to pin it down. This reverts commit f1f3b49b949af72692f7f85a1c1ef220e8630e30 Change-Id: Ie0548232daff32ee2541249b0950e23bd98c08d2 --- .../policy/impl/keyguard/KeyguardViewManager.java | 3 +++ .../java/com/android/server/wm/WindowManagerService.java | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java index 23075770e68fe..33ff71e307855 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java @@ -201,6 +201,9 @@ public class KeyguardViewManager { if (v != null) { mKeyguardHost.removeView(v); } + // TODO: Remove once b/7094175 is fixed + Slog.d(TAG, "inflateKeyguardView: b/7094175 mContext.config=" + + mContext.getResources().getConfiguration()); final LayoutInflater inflater = LayoutInflater.from(mContext); View view = inflater.inflate(R.layout.keyguard_host_view, mKeyguardHost, true); mKeyguardView = (KeyguardHostView) view.findViewById(R.id.keyguard_host_view); diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 037bfde300164..0db9f197506c2 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -2749,7 +2749,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; @@ -9268,7 +9271,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