Skip to content

Commit 64ecc0e

Browse files
Craig MautnerAndroid (Google) Code Review
authored andcommitted
Revert "Remove debugging statements before final ROM."
The bug cropped up again. Need these statements to pin it down. This reverts commit f1f3b49 Change-Id: Ie0548232daff32ee2541249b0950e23bd98c08d2
1 parent f1f3b49 commit 64ecc0e

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@ private void inflateKeyguardView(Bundle options) {
201201
if (v != null) {
202202
mKeyguardHost.removeView(v);
203203
}
204+
// TODO: Remove once b/7094175 is fixed
205+
Slog.d(TAG, "inflateKeyguardView: b/7094175 mContext.config="
206+
+ mContext.getResources().getConfiguration());
204207
final LayoutInflater inflater = LayoutInflater.from(mContext);
205208
View view = inflater.inflate(R.layout.keyguard_host_view, mKeyguardHost, true);
206209
mKeyguardView = (KeyguardHostView) view.findViewById(R.id.keyguard_host_view);

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2749,7 +2749,10 @@ public int relayoutWindow(Session session, IWindow client, int seq,
27492749
}
27502750
}
27512751

2752-
if (DEBUG_LAYOUT) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility
2752+
if (DEBUG_LAYOUT
2753+
// TODO: Remove once b/7094175 is fixed
2754+
|| ((String)win.mAttrs.getTitle()).contains("Keyguard")
2755+
) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility
27532756
+ " " + requestedWidth + "x" + requestedHeight + " " + win.mAttrs);
27542757

27552758
win.mEnforceSizeCompat = (win.mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0;
@@ -9268,7 +9271,9 @@ private final void performLayoutAndPlaceSurfacesLockedInner(boolean recoveringMe
92689271
"Reporting new frame to " + win + ": " + win.mCompatFrame);
92699272
int diff = 0;
92709273
boolean configChanged = win.isConfigChanged();
9271-
if ((DEBUG_RESIZE || DEBUG_ORIENTATION || DEBUG_CONFIGURATION)
9274+
if ((DEBUG_RESIZE || DEBUG_ORIENTATION || DEBUG_CONFIGURATION
9275+
// TODO: Remove once b/7094175 is fixed
9276+
|| ((String)win.mAttrs.getTitle()).contains("Keyguard"))
92729277
&& configChanged) {
92739278
Slog.i(TAG, "Sending new config to window " + win + ": "
92749279
+ winAnimator.mSurfaceW + "x" + winAnimator.mSurfaceH

0 commit comments

Comments
 (0)