Merge "wm tracing: rename intdefs to improve names consistency" into main (42c2ea3b) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2450,7 +2450,7 @@ final class AccessibilityController {

		long tokenInner = os.start(WINDOW_MANAGER_SERVICE);
		synchronized (mService.mGlobalLock) {
		mService.dumpDebugLocked(os, WindowTraceLogLevel.ALL);
		mService.dumpDebugLocked(os, WindowTracingLogLevel.ALL);
		}
		os.end(tokenInner);
		os.write(CPU_STATS, printCpuStats(reportedTimeStampNanos));

+3 −3

Original line number	Diff line number	Diff line
		@@ -10328,7 +10328,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		* Write all fields to an {@code ActivityRecordProto}. This assumes the
		* {@code ActivityRecordProto} is the outer-most proto data.
		*/
		void dumpDebug(ProtoOutputStream proto, @WindowTraceLogLevel int logLevel) {
		void dumpDebug(ProtoOutputStream proto, @WindowTracingLogLevel int logLevel) {
		writeNameToProto(proto, NAME);
		super.dumpDebug(proto, WINDOW_TOKEN, logLevel);
		proto.write(LAST_SURFACE_SHOWING, mLastSurfaceShowing);
		@@ -10406,9 +10406,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

		@Override
		public void dumpDebug(ProtoOutputStream proto, long fieldId,
		@WindowTraceLogLevel int logLevel) {
		@WindowTracingLogLevel int logLevel) {
		// Critical log level logs only visible elements to mitigate performance overheard
		if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
		if (logLevel == WindowTracingLogLevel.CRITICAL && !isVisible()) {
		return;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -6785,7 +6785,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		synchronized (mGlobalLock) {
		// The output proto of "activity --proto activities"
		mRootWindowContainer.dumpDebug(
		proto, ROOT_WINDOW_CONTAINER, WindowTraceLogLevel.ALL);
		proto, ROOT_WINDOW_CONTAINER, WindowTracingLogLevel.ALL);
		}
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -817,23 +817,23 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> {
		*/
		@CallSuper
		protected void dumpDebug(ProtoOutputStream proto, long fieldId,
		@WindowTraceLogLevel int logLevel) {
		@WindowTracingLogLevel int logLevel) {
		final long token = proto.start(fieldId);

		if (logLevel == WindowTraceLogLevel.ALL \|\| mHasOverrideConfiguration) {
		if (logLevel == WindowTracingLogLevel.ALL \|\| mHasOverrideConfiguration) {
		mRequestedOverrideConfiguration.dumpDebug(proto, OVERRIDE_CONFIGURATION,
		logLevel == WindowTraceLogLevel.CRITICAL);
		logLevel == WindowTracingLogLevel.CRITICAL);
		}

		// Unless trace level is set to `WindowTraceLogLevel.ALL` don't dump anything that isn't
		// required to mitigate performance overhead
		if (logLevel == WindowTraceLogLevel.ALL) {
		if (logLevel == WindowTracingLogLevel.ALL) {
		mFullConfiguration.dumpDebug(proto, FULL_CONFIGURATION, false /* critical */);
		mMergedOverrideConfiguration.dumpDebug(proto, MERGED_OVERRIDE_CONFIGURATION,
		false /* critical */);
		}

		if (logLevel == WindowTraceLogLevel.TRIM) {
		if (logLevel == WindowTracingLogLevel.TRIM) {
		// Required for Fass to automatically detect pip transitions in Winscope traces
		dumpDebugWindowingMode(proto);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -356,7 +356,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {

		@Override
		public void dumpDebug(ProtoOutputStream proto, long fieldId, int logLevel) {
		if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
		if (logLevel == WindowTracingLogLevel.CRITICAL && !isVisible()) {
		return;
		}