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

Commit 0a75ed08 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Revert "Remove debugging statements before final ROM."" into jb-mr1-dev

parents f864401c 64ecc0e1

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

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

+7 −2
Original line number Diff line number Diff line
@@ -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