commit afa61f54fb6e5e113c2df718cd1ace69ee6e3f0f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Sep 17 16:52:31 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 17 16:52:31 2024 +0000
tree 406452567a131df9cbb4e3703e9488a6c3b27c58
parent 6d364318428c57e9b0f7f97fbc18305714d7894a
parent 29e307db68e44d11461c7c8b94293f76102c9745

Merge "DO NOT MERGE Early return for getPresentFenceShift" into main

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()) {