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

Browse Source
This commit is contained in:
Kriti Dang
2023-05-16 08:28:33 +00:00
committed by Android (Google) Code Review
parent 7738796154 24eaef1468
commit af4430a740
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,8 +99,11 @@ static jintArray nativeGetSupportedHdrOutputTypes(JNIEnv* env, jclass clazz) {
// Extract unique HDR output types. // Extract unique HDR output types.
std::set<int> hdrOutputTypes; std::set<int> hdrOutputTypes;
for (const auto& hdrConversionCapability : hdrConversionCapabilities) { for (const auto& hdrConversionCapability : hdrConversionCapabilities) {
// Filter out the value for SDR which is 0.
if (hdrConversionCapability.outputType > 0) {
hdrOutputTypes.insert(hdrConversionCapability.outputType); hdrOutputTypes.insert(hdrConversionCapability.outputType);
} }
}
jintArray array = env->NewIntArray(hdrOutputTypes.size()); jintArray array = env->NewIntArray(hdrOutputTypes.size());
if (array == nullptr) { if (array == nullptr) {
jniThrowException(env, "java/lang/OutOfMemoryError", nullptr); jniThrowException(env, "java/lang/OutOfMemoryError", nullptr);