| commit | 301bb3097c267e6dbab25f6099403269b75a4e1c | [log] [tgz] |
|---|---|---|
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | Mon Mar 12 11:12:42 2018 -0600 |
| committer | Courtney Goeltzenleuchter <courtneygo@google.com> | Mon Mar 12 13:31:04 2018 -0600 |
| tree | 0f64d4e859c284850119bd73f413d2279be5eb94 | |
| parent | 990cc3e31debfb9c7891b2d6348ccc73c09147b2 [diff] [blame] |
Do not send HdrMetadata on older interface Need to make sure composer@2.2 is supported before sending HDR data across composer interface. Test: boot Bug: 74523164 Change-Id: I551c8568098990193309939483f10a30cc47350c
diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp index bb720f7..0425a8a 100644 --- a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp +++ b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
@@ -706,6 +706,9 @@ } Error Composer::setLayerHdrMetadata(Display display, Layer layer, const HdrMetadata& metadata) { + if (!mClient_2_2) { + return Error::UNSUPPORTED; + } mWriter.selectDisplay(display); mWriter.selectLayer(layer);