Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the SDR type from list returned by GetSupportedHdrOutputTypes" into udc-dev am: af4430a740

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23213678

Change-Id: If93491eb3d678215a7f9f817d2d815c60f2d771e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kriti Dang
2023-05-16 09:14:37 +00:00
committed by Automerger Merge Worker
parent e327b4618b af4430a740
commit 1bfe7cb276
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/jni/com_android_server_display_DisplayControl.cpp
View File

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