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

Merge "Added more log points for add/remove in window manager." into nyc-dev

Browse Source
This commit is contained in:
Wale Ogunwale
2016-03-03 21:10:16 +00:00
committed by Android (Google) Code Review
parent ca9605fc28 2728bf4bf9
commit cd0683b2d7
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -375,6 +375,7 @@ class AppWindowToken extends WindowToken {
// The application has stopped, so destroy any surfaces which were keeping alive // The application has stopped, so destroy any surfaces which were keeping alive
// in case they were still being used. // in case they were still being used.
void notifyAppStopped() { void notifyAppStopped() {
if (DEBUG_ADD_REMOVE) Slog.v(TAG, "notifyAppStopped: " + this);
mAppStopped = true; mAppStopped = true;
destroySurfaces(); destroySurfaces();
@@ -472,7 +473,7 @@ class AppWindowToken extends WindowToken {
winNdx = Math.min(winNdx - 1, allAppWindows.size() - 1)) { winNdx = Math.min(winNdx - 1, allAppWindows.size() - 1)) {
WindowState win = allAppWindows.get(winNdx); WindowState win = allAppWindows.get(winNdx);
if (win.mAppDied) { if (win.mAppDied) {
if (DEBUG_WINDOW_MOVEMENT) { if (DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) {
Slog.w(TAG, "removeAllDeadWindows: " + win); Slog.w(TAG, "removeAllDeadWindows: " + win);
} }
// Set mDestroying, we don't want any animation or delayed removal here. // Set mDestroying, we don't want any animation or delayed removal here.

5
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -2147,12 +2147,15 @@ public class WindowManagerService extends IWindowManager.Stub
void removeWindowLocked(WindowState win) { void removeWindowLocked(WindowState win) {
win.mWindowRemovalAllowed = true; win.mWindowRemovalAllowed = true;
if (DEBUG_ADD_REMOVE) Slog.v(TAG,
"removeWindowLocked: " + win + " callers=" + Debug.getCallers(4));
final boolean startingWindow = win.mAttrs.type == TYPE_APPLICATION_STARTING; final boolean startingWindow = win.mAttrs.type == TYPE_APPLICATION_STARTING;
if (startingWindow) { if (startingWindow) {
if (DEBUG_STARTING_WINDOW) Slog.d(TAG_WM, "Starting window removed " + win); if (DEBUG_STARTING_WINDOW) Slog.d(TAG_WM, "Starting window removed " + win);
} }
if (localLOGV || DEBUG_FOCUS || DEBUG_FOCUS_LIGHT && win==mCurrentFocus) Slog.v( if (localLOGV || DEBUG_FOCUS || DEBUG_FOCUS_LIGHT && win == mCurrentFocus) Slog.v(
TAG_WM, "Remove " + win + " client=" TAG_WM, "Remove " + win + " client="
+ Integer.toHexString(System.identityHashCode(win.mClient.asBinder())) + Integer.toHexString(System.identityHashCode(win.mClient.asBinder()))
+ ", surfaceController=" + win.mWinAnimator.mSurfaceController + " Callers=" + ", surfaceController=" + win.mWinAnimator.mSurfaceController + " Callers="

6
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -20,6 +20,7 @@ import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
import static android.view.WindowManager.LayoutParams.FLAG_SCALED; import static android.view.WindowManager.LayoutParams.FLAG_SCALED;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS;
@@ -467,9 +468,8 @@ class WindowStateAnimator {
return; return;
} }
if (WindowManagerService.localLOGV) Slog.v( if (WindowManagerService.localLOGV || DEBUG_ADD_REMOVE) Slog.v(TAG,
TAG, "Exit animation finished in " + this "Exit animation finished in " + this + ": remove=" + mWin.mRemoveOnExit);
+ ": remove=" + mWin.mRemoveOnExit);
mWin.mDestroying = true; mWin.mDestroying = true;

2
services/core/java/com/android/server/wm/WindowSurfaceController.java
View File

@@ -138,7 +138,7 @@ class WindowSurfaceController {
void destroyInTransaction() { void destroyInTransaction() {
// if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) { // if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(4)); Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(8));
// } // }
try { try {
if (mSurfaceControl != null) { if (mSurfaceControl != null) {