From 9516605d632adb8bce4f9163fb3c247be7c4a1b0 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Mon, 3 May 2021 15:49:25 +0200 Subject: [PATCH] Mark first frames in metrics properly Such that we only set the flag in case window visibility actually changes. There are a lot of other cases where we need to do a window relayout which can lead to visible jank. Test: FrameMetricsListenerTest, manual Bug: 185902609 Change-Id: Ia09ce640f3a89bf9dd4ff0f4e4469e88a513709a --- core/java/android/view/FrameMetrics.java | 6 +++--- core/java/android/view/ViewRootImpl.java | 4 +++- graphics/java/android/graphics/FrameInfo.java | 4 ++-- libs/hwui/FrameInfo.h | 2 +- tests/Input/src/com/android/test/input/ViewFrameInfoTest.kt | 6 +++--- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/core/java/android/view/FrameMetrics.java b/core/java/android/view/FrameMetrics.java index f6d525c10cc92..3cffeb0578d42 100644 --- a/core/java/android/view/FrameMetrics.java +++ b/core/java/android/view/FrameMetrics.java @@ -16,6 +16,8 @@ package android.view; +import static android.graphics.FrameInfo.FLAG_WINDOW_VISIBILITY_CHANGED; + import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; import android.os.Build; @@ -172,8 +174,6 @@ public final class FrameMetrics { **/ public static final int DEADLINE = 13; - private static final int FRAME_INFO_FLAG_FIRST_DRAW = 1 << 0; - /** * Identifiers for metrics available for each frame. * @@ -343,7 +343,7 @@ public final class FrameMetrics { } if (id == FIRST_DRAW_FRAME) { - return (mTimingData[Index.FLAGS] & FRAME_INFO_FLAG_FIRST_DRAW) != 0 ? 1 : 0; + return (mTimingData[Index.FLAGS] & FLAG_WINDOW_VISIBILITY_CHANGED) != 0 ? 1 : 0; } else if (id == INTENDED_VSYNC_TIMESTAMP) { return mTimingData[Index.INTENDED_VSYNC]; } else if (id == VSYNC_TIMESTAMP) { diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 0958f3fbd771b..a06f193255b24 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -2764,7 +2764,9 @@ public final class ViewRootImpl implements ViewParent, // to resume them mDirty.set(0, 0, mWidth, mHeight); } - mViewFrameInfo.flags |= FrameInfo.FLAG_WINDOW_LAYOUT_CHANGED; + } + if (mFirst || viewVisibilityChanged) { + mViewFrameInfo.flags |= FrameInfo.FLAG_WINDOW_VISIBILITY_CHANGED; } relayoutResult = relayoutWindow(params, viewVisibility, insetsPending); final boolean freeformResizing = (relayoutResult diff --git a/graphics/java/android/graphics/FrameInfo.java b/graphics/java/android/graphics/FrameInfo.java index b9393fff8896d..b3615ff60bcea 100644 --- a/graphics/java/android/graphics/FrameInfo.java +++ b/graphics/java/android/graphics/FrameInfo.java @@ -46,7 +46,7 @@ public final class FrameInfo { public static final int FLAGS = 0; // Is this the first-draw following a window layout? - public static final long FLAG_WINDOW_LAYOUT_CHANGED = 1; + public static final long FLAG_WINDOW_VISIBILITY_CHANGED = 1; // A renderer associated with just a Surface, not with a ViewRootImpl instance. public static final long FLAG_SURFACE_CANVAS = 1 << 2; @@ -56,7 +56,7 @@ public final class FrameInfo { public static final long INVALID_VSYNC_ID = -1; @LongDef(flag = true, value = { - FLAG_WINDOW_LAYOUT_CHANGED, FLAG_SURFACE_CANVAS }) + FLAG_WINDOW_VISIBILITY_CHANGED, FLAG_SURFACE_CANVAS }) @Retention(RetentionPolicy.SOURCE) public @interface FrameInfoFlags {} diff --git a/libs/hwui/FrameInfo.h b/libs/hwui/FrameInfo.h index 2a134fa214e75..540a88b16dc98 100644 --- a/libs/hwui/FrameInfo.h +++ b/libs/hwui/FrameInfo.h @@ -68,7 +68,7 @@ extern const std::array(FrameInfoIndex::NumIndexes namespace FrameInfoFlags { enum { - WindowLayoutChanged = 1 << 0, + WindowVisibilityChanged = 1 << 0, RTAnimation = 1 << 1, SurfaceCanvas = 1 << 2, SkippedFrame = 1 << 3, diff --git a/tests/Input/src/com/android/test/input/ViewFrameInfoTest.kt b/tests/Input/src/com/android/test/input/ViewFrameInfoTest.kt index c01d32bf4cd29..6ef1ecdae59be 100644 --- a/tests/Input/src/com/android/test/input/ViewFrameInfoTest.kt +++ b/tests/Input/src/com/android/test/input/ViewFrameInfoTest.kt @@ -35,7 +35,7 @@ class ViewFrameInfoTest { fun setUp() { mViewFrameInfo.reset() mViewFrameInfo.setInputEvent(139) - mViewFrameInfo.flags = mViewFrameInfo.flags or FrameInfo.FLAG_WINDOW_LAYOUT_CHANGED + mViewFrameInfo.flags = mViewFrameInfo.flags or FrameInfo.FLAG_WINDOW_VISIBILITY_CHANGED mTimeStarted = SystemClock.uptimeNanos() mViewFrameInfo.markDrawStart() } @@ -43,7 +43,7 @@ class ViewFrameInfoTest { @Test fun testPopulateFields() { assertThat(mViewFrameInfo.drawStart).isGreaterThan(mTimeStarted) - assertThat(mViewFrameInfo.flags).isEqualTo(FrameInfo.FLAG_WINDOW_LAYOUT_CHANGED) + assertThat(mViewFrameInfo.flags).isEqualTo(FrameInfo.FLAG_WINDOW_VISIBILITY_CHANGED) } @Test @@ -66,7 +66,7 @@ class ViewFrameInfoTest { mViewFrameInfo.populateFrameInfo(frameInfo) assertThat(frameInfo.frameInfo[FrameInfo.INPUT_EVENT_ID]).isEqualTo(139) assertThat(frameInfo.frameInfo[FrameInfo.FLAGS]).isEqualTo( - FrameInfo.FLAG_WINDOW_LAYOUT_CHANGED) + FrameInfo.FLAG_WINDOW_VISIBILITY_CHANGED) assertThat(frameInfo.frameInfo[FrameInfo.DRAW_START]).isGreaterThan(mTimeStarted) } } \ No newline at end of file