commit 91fdd4236cf51fe9d7c464f842e39305280227ad
author Yifeng Zeng <yifengzeng@google.com> Mon Sep 16 22:43:19 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 16 22:43:19 2024 +0000
tree b647f9f234991a263bec62844ea829ba54b6debd
parent a406f393716e1561faab878d386826799723e6c5
parent 89420c80be124fa76e7ec49318117e62dcd49d61

Merge "Disable native coverage for libinput_tests and inputflinger_tests." into main am: 89420c80be

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3070043

Change-Id: I2e632a2519f665219974db8b7caa5e2241201173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h

diff --git a/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h b/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h
index 2c397bd..a54d435 100644
--- a/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h
+++ b/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h
@@ -134,8 +134,11 @@
     }
 
     size_t getPresentFenceShift(Period minFramePeriod) const {
-        const bool isTwoVsyncsAhead = targetsVsyncsAhead<2>(minFramePeriod);
         size_t shift = 0;
+        if (minFramePeriod.ns() == 0) {
+            return shift;
+        }
+        const bool isTwoVsyncsAhead = targetsVsyncsAhead<2>(minFramePeriod);
         if (isTwoVsyncsAhead) {
             shift = static_cast<size_t>(expectedFrameDuration().ns() / minFramePeriod.ns());
             if (shift >= mPresentFences.size()) {