commit 082fa0a2ee812d6d5035d9dd4209987d4391a31d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Sep 17 17:44:56 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 17 17:44:56 2024 +0000
tree 406452567a131df9cbb4e3703e9488a6c3b27c58
parent 080664f0e1aaf1100aa0ac545dac89cf23873346
parent 6d364318428c57e9b0f7f97fbc18305714d7894a

Merge "Remove the redundant parameters in applyTransactionsLocked" into main am: 6d36431842

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

Change-Id: I43bdab401ccfe99a12a8ea8321621ba8cfa5f7a3
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()) {