From a315ce75a89f6c486930e5e4df074a99406ce033 Mon Sep 17 00:00:00 2001
From: Ady Abraham <adyabr@google.com>
Date: Wed, 24 Apr 2019 14:35:20 -0700
Subject: SurfaceFlinger: Force HDR content on DEFAULT refresh rate

Do not allow Performance Refresh Rate when displaying HDR content.

Test: HDR Video on YouTube
Bug: 129694529
Change-Id: Ic9b5801d3a4c8b06964e0c4dcec95ef214ebedc6
---
 services/surfaceflinger/BufferQueueLayer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'services/surfaceflinger/BufferQueueLayer.cpp')

diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index 3d51ec33b2..bd0b55f688 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -443,7 +443,8 @@ void BufferQueueLayer::onFrameAvailable(const BufferItem& item) {
     { // Autolock scope
         if (mFlinger->mUseSmart90ForVideo) {
             const nsecs_t presentTime = item.mIsAutoTimestamp ? 0 : item.mTimestamp;
-            mFlinger->mScheduler->addLayerPresentTime(mSchedulerLayerHandle, presentTime);
+            mFlinger->mScheduler->addLayerPresentTimeAndHDR(mSchedulerLayerHandle, presentTime,
+                                                            item.mHdrMetadata.validTypes != 0);
         }
 
         Mutex::Autolock lock(mQueueItemLock);
-- 
cgit v1.2.3-59-g8ed1b