commit 92fa2f4b7e0d67f0b28e9f775ce4cd094c721da1
author Ady Abraham <adyabr@google.com> Tue Feb 11 15:33:56 2020 -0800
committer Ady Abraham <adyabr@google.com> Wed Feb 12 00:09:27 2020 +0000
tree 1938dcbfab1f2bcf64dab0490bb0c1ff59cb8b48
parent 34702107fc865f01338f9538d12543b60e07d16f

SurfaceFlinger: make sure VsyncPredictor always maintains a valid slope

 - Add a safety check around the predicated vsync period in case
   the timestamps we got from present fences are incorrect.
   We suspect this happens when the device is in AOD.
 - Ignore present fences when device is in AOD.

Change-Id: Ib02287cb0b8e693b1f5f384d754c2c3d978024dc
Test: adb shell /data/nativetest64/libsurfaceflinger_unittest/libsurfaceflinger_unittest
Bug: 149299560

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index f81179a..edf9b42 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2081,7 +2081,8 @@
         }
     });
 
-    if (presentFenceTime->isValid()) {
+    if (displayDevice && displayDevice->isPrimary() &&
+        displayDevice->getPowerMode() == HWC_POWER_MODE_NORMAL && presentFenceTime->isValid()) {
         mScheduler->addPresentFence(presentFenceTime);
     }