Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '61d32c0d0f05a394129e03d774589b8d93f5f8fb':
  Changing debug for b/7094175.
This commit is contained in:
Craig Mautner
2012-10-01 10:15:05 -07:00
committed by Android Git Automerger
parent 6065c73e9f 61d32c0d0f
commit 7b9a263b50
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/res/Resources.java
View File

@@ -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());

9
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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