From a8975bd3696278445cb6ffd426eade0ac2449dd7 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Thu, 28 Jan 2016 17:13:47 -0800 Subject: [PATCH] Enable logging for surface create/destroy. bug: 26819496 Change-Id: I969b87122126df994c5bd5af177b672bcab5b7dd --- .../com/android/server/wm/WindowManagerDebugConfig.java | 6 +++--- services/core/java/com/android/server/wm/WindowState.java | 3 ++- .../java/com/android/server/wm/WindowStateAnimator.java | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java index 0979cd32a1e28..66aa8632b9a23 100644 --- a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java +++ b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java @@ -35,10 +35,10 @@ public class WindowManagerDebugConfig { static final boolean DEBUG_RESIZE = false; static final boolean DEBUG = false; - static final boolean DEBUG_ADD_REMOVE = false; + static final boolean DEBUG_ADD_REMOVE = true; static final boolean DEBUG_FOCUS = false; static final boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || false; - static final boolean DEBUG_ANIM = false; + static final boolean DEBUG_ANIM = true; static final boolean DEBUG_KEYGUARD = false; static final boolean DEBUG_LAYOUT = false; static final boolean DEBUG_LAYERS = false; @@ -50,7 +50,7 @@ public class WindowManagerDebugConfig { static final boolean DEBUG_ORIENTATION = false; static final boolean DEBUG_APP_ORIENTATION = false; static final boolean DEBUG_CONFIGURATION = false; - static final boolean DEBUG_APP_TRANSITIONS = false; + static final boolean DEBUG_APP_TRANSITIONS = true; static final boolean DEBUG_STARTING_WINDOW = false; static final boolean DEBUG_WALLPAPER = false; static final boolean DEBUG_WALLPAPER_LIGHT = false || DEBUG_WALLPAPER; diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index e8de90c93f0aa..aa20cc0f90e97 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -2225,7 +2225,8 @@ final class WindowState implements WindowManagerPolicy.WindowState { } pw.print(prefix); pw.print("mHasSurface="); pw.print(mHasSurface); pw.print(" mShownPosition="); mShownPosition.printShortString(pw); - pw.print(" isReadyForDisplay()="); pw.println(isReadyForDisplay()); + pw.print(" isReadyForDisplay()="); pw.print(isReadyForDisplay()); + pw.print(" hasSavedSurface()="); pw.println(hasSavedSurface()); if (dumpAll) { pw.print(prefix); pw.print("mFrame="); mFrame.printShortString(pw); pw.print(" last="); mLastFrame.printShortString(pw); diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index cffcc5db36ffe..428ab7a5eb5de 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -567,6 +567,10 @@ class WindowStateAnimator { WindowSurfaceController createSurfaceLocked() { final WindowState w = mWin; + if (w.hasSavedSurface()) { + Slog.i(TAG, "***** createSurface: " + this + ": called when we had a saved surface"); + } + if (mSurfaceController == null) { if (DEBUG_ANIM || DEBUG_ORIENTATION) Slog.i(TAG, "createSurface " + this + ": mDrawState=DRAW_PENDING");