Merge "Improve debugging setup for window manager package." (3e49fec5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/AccessibilityController.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package com.android.server.wm;

		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

		import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.app.Service;
		@@ -219,7 +222,7 @@ final class AccessibilityController {
		*/
		private static final class DisplayMagnifier {

		private static final String LOG_TAG = "DisplayMagnifier";
		private static final String LOG_TAG = TAG_WITH_CLASS_NAME ? "DisplayMagnifier" : TAG_WM;

		private static final boolean DEBUG_WINDOW_TRANSITIONS = false;
		private static final boolean DEBUG_ROTATION = false;
		@@ -925,7 +928,8 @@ final class AccessibilityController {
		* user can see on the screen.
		*/
		private static final class WindowsForAccessibilityObserver {
		private static final String LOG_TAG = "WindowsForAccessibilityObserver";
		private static final String LOG_TAG = TAG_WITH_CLASS_NAME ?
		"WindowsForAccessibilityObserver" : TAG_WM;

		private static final boolean DEBUG = false;

services/core/java/com/android/server/wm/AppTransition.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -39,6 +39,8 @@ import static com.android.internal.R.styleable.WindowAnimation_wallpaperIntraOpe
		import static com.android.internal.R.styleable.WindowAnimation_wallpaperIntraOpenExitAnimation;
		import static com.android.internal.R.styleable.WindowAnimation_wallpaperOpenEnterAnimation;
		import static com.android.internal.R.styleable.WindowAnimation_wallpaperOpenExitAnimation;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

		import android.annotation.Nullable;
		import android.content.Context;
		@@ -46,7 +48,6 @@ import android.content.res.Configuration;
		import android.graphics.Bitmap;
		import android.graphics.Rect;
		import android.os.Debug;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.IRemoteCallback;
		import android.os.RemoteException;
		@@ -82,10 +83,10 @@ import java.util.concurrent.Executors;
		// mOpeningApps and mClosingApps are the lists of tokens that will be
		// made visible or hidden at the next transition.
		public class AppTransition implements Dump {
		private static final String TAG = "AppTransition";
		private static final String TAG = TAG_WITH_CLASS_NAME ? "AppTransition" : TAG_WM;
		private static final boolean DEBUG_APP_TRANSITIONS =
		WindowManagerService.DEBUG_APP_TRANSITIONS;
		private static final boolean DEBUG_ANIM = WindowManagerService.DEBUG_ANIM;
		WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
		private static final boolean DEBUG_ANIM = WindowManagerDebugConfig.DEBUG_ANIM;
		private static final int CLIP_REVEAL_TRANSLATION_Y_DP = 8;

		/** Not set up for a transition. */

services/core/java/com/android/server/wm/AppWindowAnimator.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -16,9 +16,12 @@

		package com.android.server.wm;

		import static com.android.server.wm.WindowManagerService.DEBUG_ANIM;
		import static com.android.server.wm.WindowManagerService.DEBUG_LAYERS;
		import static com.android.server.wm.WindowManagerService.SHOW_TRANSACTIONS;
		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_VISIBILITY;
		import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
		import static com.android.server.wm.WindowManagerService.TYPE_LAYER_OFFSET;

		import android.graphics.Matrix;
		@@ -35,7 +38,7 @@ import java.io.PrintWriter;
		import java.util.ArrayList;

		public class AppWindowAnimator {
		static final String TAG = "AppWindowAnimator";
		static final String TAG = TAG_WITH_CLASS_NAME ? "AppWindowAnimator" : TAG_WM;

		private static final int PROLONG_ANIMATION_DISABLED = 0;
		static final int PROLONG_ANIMATION_AT_END = 1;
		@@ -410,8 +413,7 @@ public class AppWindowAnimator {
		final int NW = mAllAppWinAnimators.size();
		for (int i=0; i<NW; i++) {
		WindowStateAnimator winAnimator = mAllAppWinAnimators.get(i);
		if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
		"performing show on: " + winAnimator);
		if (DEBUG_VISIBILITY) Slog.v(TAG, "performing show on: " + winAnimator);
		winAnimator.performShowLocked();
		isAnimating \|= winAnimator.isAnimating();
		}

services/core/java/com/android/server/wm/AppWindowToken.java

+22 −17

Original line number	Diff line number	Diff line
		@@ -17,9 +17,12 @@
		package com.android.server.wm;

		import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
		import static com.android.server.wm.WindowManagerService.DEBUG_ANIM;
		import static com.android.server.wm.WindowManagerService.DEBUG_APP_TRANSITIONS;
		import static com.android.server.wm.WindowManagerService.TAG;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

		import com.android.server.input.InputApplicationHandle;
		import com.android.server.wm.WindowManagerService.H;
		@@ -44,6 +47,8 @@ class AppTokenList extends ArrayList<AppWindowToken> {
		* really activity) that is displaying windows.
		*/
		class AppWindowToken extends WindowToken {
		private static final String TAG = TAG_WITH_CLASS_NAME ? "AppWindowToken" : TAG_WM;

		// Non-null only for application tokens.
		final IApplicationToken appToken;

		@@ -152,7 +157,7 @@ class AppWindowToken extends WindowToken {
		continue;
		}
		try {
		if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG,
		if (DEBUG_VISIBILITY) Slog.v(TAG,
		"Setting visibility of " + win + ": " + (!clientHidden));
		win.mClient.dispatchAppVisibility(!clientHidden);
		} catch (RemoteException e) {
		@@ -170,7 +175,7 @@ class AppWindowToken extends WindowToken {
		int numDrawn = 0;
		boolean nowGone = true;

		if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG,
		if (DEBUG_VISIBILITY) Slog.v(TAG,
		"Update reported visibility: " + this);
		final int N = allAppWindows.size();
		for (int i=0; i<N; i++) {
		@@ -181,12 +186,12 @@ class AppWindowToken extends WindowToken {
		\|\| win.mDestroying) {
		continue;
		}
		if (WindowManagerService.DEBUG_VISIBILITY) {
		Slog.v(WindowManagerService.TAG, "Win " + win + ": isDrawn="
		if (DEBUG_VISIBILITY) {
		Slog.v(TAG, "Win " + win + ": isDrawn="
		+ win.isDrawnLw()
		+ ", isAnimating=" + win.mWinAnimator.isAnimating());
		if (!win.isDrawnLw()) {
		Slog.v(WindowManagerService.TAG, "Not displayed: s=" +
		Slog.v(TAG, "Not displayed: s=" +
		win.mWinAnimator.mSurfaceController
		+ " pv=" + win.mPolicyVisibility
		+ " mDrawState=" + win.mWinAnimator.mDrawState
		@@ -220,7 +225,7 @@ class AppWindowToken extends WindowToken {
		nowVisible = reportedVisible;
		}
		}
		if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG, "VIS " + this + ": interesting="
		if (DEBUG_VISIBILITY) Slog.v(TAG, "VIS " + this + ": interesting="
		+ numInteresting + " visible=" + numVisible);
		if (nowDrawn != reportedDrawn) {
		if (nowDrawn) {
		@@ -231,8 +236,8 @@ class AppWindowToken extends WindowToken {
		reportedDrawn = nowDrawn;
		}
		if (nowVisible != reportedVisible) {
		if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(
		WindowManagerService.TAG, "Visibility changed in " + this
		if (DEBUG_VISIBILITY) Slog.v(
		TAG, "Visibility changed in " + this
		+ ": vis=" + nowVisible);
		reportedVisible = nowVisible;
		Message m = service.mH.obtainMessage(
		@@ -295,7 +300,7 @@ class AppWindowToken extends WindowToken {
		final Task task = mTask;
		if (task != null) {
		if (!task.removeAppToken(this)) {
		Slog.e(WindowManagerService.TAG, "removeAppFromTaskLocked: token=" + this
		Slog.e(TAG, "removeAppFromTaskLocked: token=" + this
		+ " not found.");
		}
		task.mStack.mExitingAppTokens.remove(this);
		@@ -330,7 +335,7 @@ class AppWindowToken extends WindowToken {
		return;
		}

		if (DEBUG_APP_TRANSITIONS \|\| DEBUG_ANIM) Slog.v(TAG,
		if (DEBUG_APP_TRANSITIONS \|\| DEBUG_ANIM) Slog.v(TAG_WM,
		"Restoring saved surfaces: " + this + ", allDrawn=" + allDrawn);

		mAnimatingWithSavedSurface = true;
		@@ -357,8 +362,8 @@ class AppWindowToken extends WindowToken {
		// and never beyond allAppWindows bounds.
		winNdx = Math.min(winNdx - 1, allAppWindows.size() - 1)) {
		WindowState win = allAppWindows.get(winNdx);
		if (WindowManagerService.DEBUG_WINDOW_MOVEMENT) {
		Slog.w(WindowManagerService.TAG, "removeAllWindows: removing win=" + win);
		if (DEBUG_WINDOW_MOVEMENT) {
		Slog.w(TAG, "removeAllWindows: removing win=" + win);
		}

		service.removeWindowLocked(win);
		@@ -377,8 +382,8 @@ class AppWindowToken extends WindowToken {
		winNdx = Math.min(winNdx - 1, allAppWindows.size() - 1)) {
		WindowState win = allAppWindows.get(winNdx);
		if (win.mAppDied) {
		if (WindowManagerService.DEBUG_WINDOW_MOVEMENT) {
		Slog.w(WindowManagerService.TAG, "removeAllDeadWindows: " + win);
		if (DEBUG_WINDOW_MOVEMENT) {
		Slog.w(TAG, "removeAllDeadWindows: " + win);
		}
		// Set mDestroying, we don't want any animation or delayed removal here.
		win.mDestroying = true;

services/core/java/com/android/server/wm/BlackFrame.java

+14 −10

Original line number	Diff line number	Diff line
		@@ -16,6 +16,13 @@

		package com.android.server.wm;

		import static android.graphics.PixelFormat.OPAQUE;
		import static android.view.SurfaceControl.FX_SURFACE_DIM;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_SURFACE_TRACE;
		import static com.android.server.wm.WindowManagerDebugConfig.SHOW_SURFACE_ALLOC;
		import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

		import java.io.PrintWriter;

		import android.graphics.Matrix;
		@@ -44,21 +51,20 @@ public class BlackFrame {
		int w = r-l;
		int h = b-t;

		if (WindowManagerService.DEBUG_SURFACE_TRACE) {
		if (DEBUG_SURFACE_TRACE) {
		surface = new WindowSurfaceController.SurfaceTrace(session, "BlackSurface("
		+ l + ", " + t + ")",
		w, h, PixelFormat.OPAQUE, SurfaceControl.FX_SURFACE_DIM \| SurfaceControl.HIDDEN);
		w, h, OPAQUE, FX_SURFACE_DIM \| SurfaceControl.HIDDEN);
		} else {
		surface = new SurfaceControl(session, "BlackSurface",
		w, h, PixelFormat.OPAQUE, SurfaceControl.FX_SURFACE_DIM \| SurfaceControl.HIDDEN);
		w, h, OPAQUE, FX_SURFACE_DIM \| SurfaceControl.HIDDEN);
		}

		surface.setAlpha(1);
		surface.setLayerStack(layerStack);
		surface.setLayer(layer);
		surface.show();
		if (WindowManagerService.SHOW_TRANSACTIONS \|\|
		WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(WindowManagerService.TAG,
		if (SHOW_TRANSACTIONS \|\| SHOW_SURFACE_ALLOC) Slog.i(TAG_WM,
		" BLACK " + surface + ": CREATE layer=" + layer);
		}

		@@ -76,7 +82,7 @@ public class BlackFrame {
		mTmpFloats[Matrix.MSCALE_X], mTmpFloats[Matrix.MSKEW_Y],
		mTmpFloats[Matrix.MSKEW_X], mTmpFloats[Matrix.MSCALE_Y]);
		if (false) {
		Slog.i(WindowManagerService.TAG, "Black Surface @ (" + left + "," + top + "): ("
		Slog.i(TAG_WM, "Black Surface @ (" + left + "," + top + "): ("
		+ mTmpFloats[Matrix.MTRANS_X] + ","
		+ mTmpFloats[Matrix.MTRANS_Y] + ") matrix=["
		+ mTmpFloats[Matrix.MSCALE_X] + ","
		@@ -149,9 +155,7 @@ public class BlackFrame {
		if (mBlackSurfaces != null) {
		for (int i=0; i<mBlackSurfaces.length; i++) {
		if (mBlackSurfaces[i] != null) {
		if (WindowManagerService.SHOW_TRANSACTIONS \|\|
		WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(
		WindowManagerService.TAG,
		if (SHOW_TRANSACTIONS \|\| SHOW_SURFACE_ALLOC) Slog.i(TAG_WM,
		" BLACK " + mBlackSurfaces[i].surface + ": DESTROY");
		mBlackSurfaces[i].surface.destroy();
		mBlackSurfaces[i] = null;