From 17fc860fc9ff99dff225fb779c44677c96be26f4 Mon Sep 17 00:00:00 2001 From: Rachel Lee Date: Wed, 26 Apr 2023 10:15:23 -0700 Subject: [PATCH] Rename const to kFrameTimelinesCapacity. Bug: 270612751 Test: build Change-Id: Ia7f295974c3869f092d53425175cd7678c35f770 --- core/java/android/view/Choreographer.java | 2 +- core/java/android/view/DisplayEventReceiver.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java index e7e1993d29021..01779047a0cd0 100644 --- a/core/java/android/view/Choreographer.java +++ b/core/java/android/view/Choreographer.java @@ -1116,7 +1116,7 @@ public final class Choreographer { private boolean mInCallback = false; FrameData() { - allocateFrameTimelines(DisplayEventReceiver.VsyncEventData.FRAME_TIMELINES_LENGTH); + allocateFrameTimelines(DisplayEventReceiver.VsyncEventData.FRAME_TIMELINES_CAPACITY); } /** The time in nanoseconds when the frame started being rendered. */ diff --git a/core/java/android/view/DisplayEventReceiver.java b/core/java/android/view/DisplayEventReceiver.java index dcc57cf60b3f5..50246f6007536 100644 --- a/core/java/android/view/DisplayEventReceiver.java +++ b/core/java/android/view/DisplayEventReceiver.java @@ -152,11 +152,10 @@ public abstract class DisplayEventReceiver { * @hide */ public static final class VsyncEventData { - // The amount of frame timeline choices. - // Must be in sync with VsyncEventData::kFrameTimelinesLength in - // frameworks/native/libs/gui/include/gui/VsyncEventData.h. If they do not match, a runtime - // assertion is thrown when Choreographer is processing VsyncEventData. - static final int FRAME_TIMELINES_LENGTH = 7; + // The max capacity of frame timeline choices. + // Must be in sync with VsyncEventData::kFrameTimelinesCapacity in + // frameworks/native/libs/gui/include/gui/VsyncEventData.h + static final int FRAME_TIMELINES_CAPACITY = 7; public static class FrameTimeline { FrameTimeline() {} @@ -201,7 +200,7 @@ public abstract class DisplayEventReceiver { public int frameTimelinesLength = 0; VsyncEventData() { - frameTimelines = new FrameTimeline[FRAME_TIMELINES_LENGTH]; + frameTimelines = new FrameTimeline[FRAME_TIMELINES_CAPACITY]; for (int i = 0; i < frameTimelines.length; i++) { frameTimelines[i] = new FrameTimeline(); }