Merge "Changing debug for b/7094175." into jb-mr1-dev

Author: Craig Mautner

core/java/android/content/res/Resources.java

@@ -1554,8 +1554,6 @@ private void clearDrawableCache(
     public static void updateSystemConfiguration(Configuration config, DisplayMetrics metrics,
             CompatibilityInfo compat) {
         if (mSystem != null) {
-            // TODO: Remove once b/7094175 is fixed
-            Slog.v(TAG, "updateSystemConfiguration: b/7094175 config=" + config);
             mSystem.updateConfiguration(config, metrics, compat);
             //Log.i(TAG, "Updated system resources " + mSystem
             //        + ": " + mSystem.getConfiguration());

services/java/com/android/server/wm/WindowManagerService.java

@@ -2748,7 +2748,10 @@ public int relayoutWindow(Session session, IWindow client, int seq,
                 }
             }
 
-            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;
@@ -9255,7 +9258,9 @@ private final void performLayoutAndPlaceSurfacesLockedInner(boolean recoveringMe
                             "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