From 24eaef14686fee72fff1547bb8c7da7ac8b28f15 Mon Sep 17 00:00:00 2001
From: Kriti Dang <kritidang@google.com>
Date: Mon, 15 May 2023 15:54:51 +0200
Subject: [PATCH] Remove the SDR type from list returned by
 GetSupportedHdrOutputTypes

Test: atest HdrConversionEnabledTest
Bug: 282568754
Change-Id: I4676bba9c87c188ffc82c6a5e5b00539e0b564df
---
 .../core/jni/com_android_server_display_DisplayControl.cpp   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/core/jni/com_android_server_display_DisplayControl.cpp b/services/core/jni/com_android_server_display_DisplayControl.cpp
index 72829c0144a36..5f95c28e6d097 100644
--- a/services/core/jni/com_android_server_display_DisplayControl.cpp
+++ b/services/core/jni/com_android_server_display_DisplayControl.cpp
@@ -99,7 +99,10 @@ static jintArray nativeGetSupportedHdrOutputTypes(JNIEnv* env, jclass clazz) {
     // Extract unique HDR output types.
     std::set<int> hdrOutputTypes;
     for (const auto& hdrConversionCapability : hdrConversionCapabilities) {
-        hdrOutputTypes.insert(hdrConversionCapability.outputType);
+        // Filter out the value for SDR which is 0.
+        if (hdrConversionCapability.outputType > 0) {
+            hdrOutputTypes.insert(hdrConversionCapability.outputType);
+        }
     }
     jintArray array = env->NewIntArray(hdrOutputTypes.size());
     if (array == nullptr) {