Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61d32c0d authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit 'a6efc965':
  Changing debug for b/7094175.
parents 1a2fd69a a6efc965

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

+0 −2
Original line number Diff line number Diff line
@@ -1554,8 +1554,6 @@ public class Resources { 
    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

+7 −2
Original line number Diff line number Diff line
@@ -2748,7 +2748,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;
@@ -9255,7 +9258,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