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.cpp b/services/surfaceflinger/SurfaceFlingerProperties.cpp
index 43eebd7..b654ba7 100644
--- a/services/surfaceflinger/SurfaceFlingerProperties.cpp
+++ b/services/surfaceflinger/SurfaceFlingerProperties.cpp
@@ -15,8 +15,8 @@
namespace sysprop {
using namespace android::hardware::configstore;
using namespace android::hardware::configstore::V1_0;
-using ::android::hardware::graphics::common::V1_1::PixelFormat;
using ::android::hardware::graphics::common::V1_2::Dataspace;
+using ::android::hardware::graphics::common::V1_2::PixelFormat;
int64_t vsync_event_phase_offset_ns(int64_t defaultValue) {
auto temp = SurfaceFlingerProperties::vsync_event_phase_offset_ns();