SF: accommodate 1.2 format in sampling code
Adds a cast to accommodate the use of 1.2 based pixel format
in the display sampling engine code.
Test: build
Test: vts, pts
Fixes: 122943743
This was the culprit in build-breaking topic. This branch and
Change-Id: Icf88642697b0167e5ba4a2dae7470d01c6220c15 had a silent
merge conflict that escaped TH notice. b/123404649 for full details.
This reverts commit b04e9b63550247ecb51c43ed878420680a3aa020.
Change-Id: Ic0946a261ffb73355909d22f972dc4de96088a6e
diff --git a/services/surfaceflinger/SurfaceFlingerProperties.h b/services/surfaceflinger/SurfaceFlingerProperties.h
index 92ce5c2..9b26883 100644
--- a/services/surfaceflinger/SurfaceFlingerProperties.h
+++ b/services/surfaceflinger/SurfaceFlingerProperties.h
@@ -46,13 +46,13 @@
android::hardware::graphics::common::V1_2::Dataspace defaultValue);
int32_t default_composition_pixel_format(
- android::hardware::graphics::common::V1_1::PixelFormat defaultValue);
+ android::hardware::graphics::common::V1_2::PixelFormat defaultValue);
int64_t wcg_composition_dataspace(
android::hardware::graphics::common::V1_2::Dataspace defaultValue);
int32_t wcg_composition_pixel_format(
- android::hardware::graphics::common::V1_1::PixelFormat defaultValue);
+ android::hardware::graphics::common::V1_2::PixelFormat defaultValue);
} // namespace sysprop
} // namespace android
#endif // SURFACEFLINGERPROPERTIES_H_