Merge "Refactor-inline a redundant debug constant." (786eff23) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ import static com.android.server.wm.DisplayContentProto.ROTATION;
		import static com.android.server.wm.DisplayContentProto.SCREEN_ROTATION_ANIMATION;
		import static com.android.server.wm.DisplayContentProto.STACKS;
		import static com.android.server.wm.DisplayContentProto.WINDOW_CONTAINER;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_BOOT;
		@@ -2920,9 +2921,11 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		mWmService.mH.obtainMessage(REPORT_FOCUS_CHANGE, this).sendToTarget();
		}

		if (DEBUG_FOCUS_LIGHT \|\| mWmService.localLOGV) Slog.v(TAG_WM, "Changing focus from "
		if (DEBUG_FOCUS_LIGHT \|\| DEBUG) {
		Slog.v(TAG_WM, "Changing focus from "
		+ mCurrentFocus + " to " + newFocus + " displayId=" + getDisplayId()
		+ " Callers=" + Debug.getCallers(4));
		}
		final WindowState oldFocus = mCurrentFocus;
		mCurrentFocus = newFocus;
		mLosingFocus.remove(newFocus);

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_SCREEN_ON;
		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.localLOGV;

		import android.Manifest.permission;
		import android.annotation.NonNull;
		@@ -2597,7 +2596,7 @@ public class DisplayPolicy {
		}
		final int fl = PolicyControl.getWindowFlags(null,
		mTopFullscreenOpaqueWindowState.getAttrs());
		if (localLOGV) {
		if (WindowManagerDebugConfig.DEBUG) {
		Slog.d(TAG, "frame: " + mTopFullscreenOpaqueWindowState.getFrameLw());
		Slog.d(TAG, "attr: " + mTopFullscreenOpaqueWindowState.getAttrs()
		+ " lp.flags=0x" + Integer.toHexString(fl));

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

+9 −6

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
		import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
		import static android.view.WindowManager.LayoutParams.isSystemAlertWindowType;

		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_POSITIONING;
		import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
		@@ -227,8 +228,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient {
		@Override
		public void finishDrawing(IWindow window,
		@Nullable SurfaceControl.Transaction postDrawTransaction) {
		if (WindowManagerService.localLOGV) Slog.v(
		TAG_WM, "IWindow finishDrawing called for " + window);
		if (DEBUG) Slog.v(TAG_WM, "IWindow finishDrawing called for " + window);
		mService.finishDrawingWindow(this, window, postDrawTransaction);
		}

		@@ -474,8 +474,9 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient {
		mPackageName = packageName;
		mRelayoutTag = "relayoutWindow: " + mPackageName;
		if (mSurfaceSession == null) {
		if (WindowManagerService.localLOGV) Slog.v(
		TAG_WM, "First window added to " + this + ", creating SurfaceSession");
		if (DEBUG) {
		Slog.v(TAG_WM, "First window added to " + this + ", creating SurfaceSession");
		}
		mSurfaceSession = new SurfaceSession();
		if (SHOW_TRANSACTIONS) Slog.i(
		TAG_WM, " NEW SURFACE SESSION " + mSurfaceSession);
		@@ -565,8 +566,10 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient {
		return;
		}

		if (WindowManagerService.localLOGV) Slog.v(TAG_WM, "Last window removed from " + this
		if (DEBUG) {
		Slog.v(TAG_WM, "Last window removed from " + this
		+ ", destroying " + mSurfaceSession);
		}
		if (SHOW_TRANSACTIONS) Slog.i(TAG_WM, " KILL SURFACE SESSION " + mSurfaceSession);
		try {
		mSurfaceSession.kill();

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

+16 −13

Original line number	Diff line number	Diff line
		@@ -297,7 +297,6 @@ public class WindowManagerService extends IWindowManager.Stub
		static final int LAYOUT_REPEAT_THRESHOLD = 4;

		static final boolean PROFILE_ORIENTATION = false;
		static final boolean localLOGV = DEBUG;

		/** How much to multiply the policy's type layer, to reserve room
		* for multiple windows of the same type and Z-ordering adjustment
		@@ -1671,8 +1670,10 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		displayContent.getInputMonitor().updateInputWindowsLw(false /force/);

		if (localLOGV \|\| DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "addWindow: New client "
		+ client.asBinder() + ": window=" + win + " Callers=" + Debug.getCallers(5));
		if (DEBUG \|\| DEBUG_ADD_REMOVE) {
		Slog.v(TAG_WM, "addWindow: New client " + client.asBinder()
		+ ": window=" + win + " Callers=" + Debug.getCallers(5));
		}

		if (win.isVisibleOrAdding() && displayContent.updateOrientation()) {
		displayContent.sendNewConfiguration();
		@@ -2339,16 +2340,18 @@ public class WindowManagerService extends IWindowManager.Stub
		outCutout.set(win.getWmDisplayCutout().getDisplayCutout());
		outBackdropFrame.set(win.getBackdropFrame(win.getFrameLw()));
		outInsetsState.set(displayContent.getInsetsStateController().getInsetsForDispatch(win));
		if (localLOGV) Slog.v(
		TAG_WM, "Relayout given client " + client.asBinder()
		if (DEBUG) {
		Slog.v(TAG_WM, "Relayout given client " + client.asBinder()
		+ ", requestedWidth=" + requestedWidth
		+ ", requestedHeight=" + requestedHeight
		+ ", viewVisibility=" + viewVisibility
		+ "\nRelayout returning frame=" + outFrame
		+ ", surface=" + outSurfaceControl);
		}

		if (localLOGV \|\| DEBUG_FOCUS) Slog.v(
		TAG_WM, "Relayout of " + win + ": focusMayChange=" + focusMayChange);
		if (DEBUG \|\| DEBUG_FOCUS) {
		Slog.v(TAG_WM, "Relayout of " + win + ": focusMayChange=" + focusMayChange);
		}

		result \|= mInTouchMode ? WindowManagerGlobal.RELAYOUT_RES_IN_TOUCH_MODE : 0;

		@@ -5227,7 +5230,7 @@ public class WindowManagerService extends IWindowManager.Stub

		final WindowState windowForClientLocked(Session session, IBinder client, boolean throwOnError) {
		WindowState win = mWindowMap.get(client);
		if (localLOGV) Slog.v(TAG_WM, "Looking up client " + client + ": " + win);
		if (DEBUG) Slog.v(TAG_WM, "Looking up client " + client + ": " + win);
		if (win == null) {
		if (throwOnError) {
		throw new IllegalArgumentException(

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

+27 −21

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ import static com.android.server.wm.IdentifierProto.USER_ID;
		import static com.android.server.wm.MoveAnimationSpecProto.DURATION_MS;
		import static com.android.server.wm.MoveAnimationSpecProto.FROM;
		import static com.android.server.wm.MoveAnimationSpecProto.TO;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;
		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_APP_TRANSITIONS;
		@@ -115,7 +116,6 @@ import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;
		import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_REMOVING_FOCUS;
		import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES;
		import static com.android.server.wm.WindowManagerService.WINDOWS_FREEZING_SCREENS_TIMEOUT;
		import static com.android.server.wm.WindowManagerService.localLOGV;
		import static com.android.server.wm.WindowStateAnimator.COMMIT_DRAW_PENDING;
		import static com.android.server.wm.WindowStateAnimator.DRAW_PENDING;
		import static com.android.server.wm.WindowStateAnimator.HAS_DRAWN;
		@@ -755,9 +755,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		mSeq = seq;
		mPowerManagerWrapper = powerManagerWrapper;
		mForceSeamlesslyRotate = token.mRoundedCornerOverlay;
		if (localLOGV) Slog.v(
		TAG, "Window " + this + " client=" + c.asBinder()
		if (DEBUG) {
		Slog.v(TAG, "Window " + this + " client=" + c.asBinder()
		+ " token=" + token + " (" + mAttrs.token + ")" + " params=" + a);
		}
		try {
		c.asBinder().linkToDeath(deathRecipient, 0);
		} catch (RemoteException e) {
		@@ -825,7 +826,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}

		void attach() {
		if (localLOGV) Slog.v(TAG, "Attaching " + this + " token=" + mToken);
		if (DEBUG) Slog.v(TAG, "Attaching " + this + " token=" + mToken);
		mSession.windowAddedLocked(mAttrs.packageName);
		}

		@@ -1125,14 +1126,15 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}
		}

		if (DEBUG_LAYOUT \|\| localLOGV) Slog.v(TAG,
		"Resolving (mRequestedWidth="
		if (DEBUG_LAYOUT \|\| DEBUG) {
		Slog.v(TAG, "Resolving (mRequestedWidth="
		+ mRequestedWidth + ", mRequestedheight="
		+ mRequestedHeight + ") to" + " (pw=" + pw + ", ph=" + ph
		+ "): frame=" + mWindowFrames.mFrame.toShortString()
		+ " " + mWindowFrames.getInsetsInfo()
		+ " " + mAttrs.getTitle());
		}
		}

		// TODO: Look into whether this override is still necessary.
		@Override
		@@ -1280,9 +1282,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		final boolean dragResizingChanged = isDragResizeChanged()
		&& !isDragResizingChangeReported();

		if (localLOGV) Slog.v(TAG_WM, "Resizing " + this + ": configChanged=" + configChanged
		if (DEBUG) {
		Slog.v(TAG_WM, "Resizing " + this + ": configChanged=" + configChanged
		+ " dragResizingChanged=" + dragResizingChanged
		+ " last=" + mWindowFrames.mLastFrame + " frame=" + mWindowFrames.mFrame);
		}

		// We update mLastFrame always rather than in the conditional with the last inset
		// variables, because mFrameSizeChanged only tracks the width and height changing.
		@@ -1979,11 +1983,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		if (startingWindow && DEBUG_STARTING_WINDOW) Slog.d(TAG_WM,
		"Starting window removed " + this);

		if (localLOGV \|\| DEBUG_FOCUS \|\| DEBUG_FOCUS_LIGHT && isFocused())
		if (DEBUG \|\| DEBUG_FOCUS \|\| DEBUG_FOCUS_LIGHT && isFocused()) {
		Slog.v(TAG_WM, "Remove " + this + " client="
		+ Integer.toHexString(System.identityHashCode(mClient.asBinder()))
		+ ", surfaceController=" + mWinAnimator.mSurfaceController + " Callers="
		+ Debug.getCallers(5));
		}

		final long origId = Binder.clearCallingIdentity();

		@@ -4377,8 +4382,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		return;
		}

		if (localLOGV \|\| DEBUG_ADD_REMOVE) Slog.v(TAG,
		"Exit animation finished in " + this + ": remove=" + mRemoveOnExit);
		if (DEBUG \|\| DEBUG_ADD_REMOVE) {
		Slog.v(TAG, "Exit animation finished in " + this + ": remove=" + mRemoveOnExit);
		}

		mDestroying = true;