Revert "graphics.common: add HSV format definition to 1.2"

This reverts commit 97e1a932ec.

Reason for revert: broke build 

Change-Id: Ib264957e9a1de83c37e4129471b3c75522e21d08

configstore/1.2/ISurfaceFlingerConfigs.hal

@@ -15,7 +15,7 @@
  */
 package android.hardware.configstore@1.2;
 
-import android.hardware.graphics.common@1.2::PixelFormat;
+import android.hardware.graphics.common@1.1::PixelFormat;
 import android.hardware.graphics.common@1.2::Dataspace;
 import @1.1::ISurfaceFlingerConfigs;
 import @1.0::OptionalBool;

configstore/1.2/default/SurfaceFlingerConfigs.cpp

@@ -27,8 +27,8 @@ namespace configstore {
 namespace V1_2 {
 namespace implementation {
 
+using ::android::hardware::graphics::common::V1_1::PixelFormat;
 using ::android::hardware::graphics::common::V1_2::Dataspace;
-using ::android::hardware::graphics::common::V1_2::PixelFormat;
 
 // ::android::hardware::configstore::V1_0::ISurfaceFlingerConfigs implementation.
 Return<void> SurfaceFlingerConfigs::vsyncEventPhaseOffsetNs(vsyncEventPhaseOffsetNs_cb _hidl_cb) {

configstore/1.2/vts/functional/VtsHalConfigstoreV1_2TargetTest.cpp

@@ -31,10 +31,10 @@ using ::android::hardware::Void;
 using ::android::hardware::configstore::V1_0::OptionalBool;
 using ::android::hardware::configstore::V1_0::OptionalInt64;
 using ::android::hardware::configstore::V1_0::OptionalUInt64;
-using ::android::hardware::configstore::V1_2::DisplayPrimaries;
 using ::android::hardware::configstore::V1_2::ISurfaceFlingerConfigs;
+using ::android::hardware::configstore::V1_2::DisplayPrimaries;
+using ::android::hardware::graphics::common::V1_1::PixelFormat;
 using ::android::hardware::graphics::common::V1_2::Dataspace;
-using ::android::hardware::graphics::common::V1_2::PixelFormat;
 
 #define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
 #define EXPECT_OK(ret) EXPECT_TRUE(ret.isOk())

graphics/common/1.2/types.hal

@@ -25,8 +25,7 @@ import @1.1::PixelFormat;
 /**
  * Hdr
  */
-@export(name="android_hdr_v1_2_t", value_prefix="HAL_HDR_",
+@export(name="android_hdr_v1_2_t", value_prefix="HAL_HDR_")
-        export_parent="false")
 enum Hdr : @1.0::Hdr {
     HDR10_PLUS = 4,
 };
@@ -97,18 +96,3 @@ struct HardwareBuffer {
  */
 typedef int32_t[4] Rect;
 
-/**
- * Pixel formats for graphics buffers.
- */
-@export(name="android_pixel_format_v1_2_t", value_prefix="HAL_PIXEL_FORMAT_",
-        export_parent="false")
-enum PixelFormat : @1.1::PixelFormat {
-    /**
-     * 24-bit format that has 8-bit H, S, and V components, in that order,
-     * from the lowest memory address to the highest memory address.
-     *
-     * The component values are unsigned normalized to the range [0, 1], whose
-     * interpretation is defined by the dataspace.
-    */
-    HSV_888 = 0x37,
-};

graphics/composer/2.3/IComposerClient.hal

@@ -17,7 +17,7 @@
 package android.hardware.graphics.composer@2.3;
 
 import android.hardware.graphics.common@1.1::RenderIntent;
-import android.hardware.graphics.common@1.2::PixelFormat;
+import android.hardware.graphics.common@1.1::PixelFormat;
 import android.hardware.graphics.common@1.2::ColorMode;
 import android.hardware.graphics.common@1.2::Dataspace;
 import android.hardware.graphics.common@1.2::Hdr;

graphics/composer/2.3/utils/hal/include/composer-hal/2.3/ComposerClient.h

@@ -123,7 +123,7 @@ class ComposerClientImpl : public V2_2::hal::detail::ComposerClientImpl<Interfac
     Return<void> getDisplayedContentSamplingAttributes(
         uint64_t display,
         IComposerClient::getDisplayedContentSamplingAttributes_cb hidl_cb) override {
-        PixelFormat format;
+        common::V1_1::PixelFormat format;
         common::V1_2::Dataspace dataspace;
         hidl_bitfield<IComposerClient::FormatColorComponent> componentMask;
         Error error =

graphics/composer/2.3/utils/hal/include/composer-hal/2.3/ComposerHal.h

@@ -25,11 +25,11 @@ namespace composer {
 namespace V2_3 {
 namespace hal {
 
+using common::V1_1::PixelFormat;
 using common::V1_1::RenderIntent;
 using common::V1_2::ColorMode;
 using common::V1_2::Dataspace;
 using common::V1_2::Hdr;
-using common::V1_2::PixelFormat;
 using V2_1::Display;
 using V2_1::Error;
 using V2_1::Layer;

graphics/composer/2.3/utils/passthrough/include/composer-passthrough/2.3/HwcHal.h

@@ -34,11 +34,11 @@ namespace passthrough {
 
 namespace detail {
 
+using common::V1_1::PixelFormat;
 using common::V1_1::RenderIntent;
 using common::V1_2::ColorMode;
 using common::V1_2::Dataspace;
 using common::V1_2::Hdr;
-using common::V1_2::PixelFormat;
 using V2_1::Display;
 using V2_1::Error;
 
@@ -91,16 +91,14 @@ class HwcHalImpl : public V2_2::passthrough::detail::HwcHalImpl<Hal> {
 
     Error getClientTargetSupport_2_3(Display display, uint32_t width, uint32_t height,
                                      PixelFormat format, Dataspace dataspace) override {
-        return getClientTargetSupport_2_2(display, width, height,
+        return getClientTargetSupport_2_2(display, width, height, format,
-                                          static_cast<common::V1_1::PixelFormat>(format),
                                           static_cast<common::V1_1::Dataspace>(dataspace));
     }
 
     Error getReadbackBufferAttributes_2_3(Display display, PixelFormat* outFormat,
                                           Dataspace* outDataspace) override {
         return getReadbackBufferAttributes(
-                display, reinterpret_cast<common::V1_1::PixelFormat*>(outFormat),
+            display, outFormat, reinterpret_cast<common::V1_1::Dataspace*>(outDataspace));
-                reinterpret_cast<common::V1_1::Dataspace*>(outDataspace));
     }
 
     Error getDisplayIdentificationData(Display display, uint8_t* outPort,

graphics/composer/2.3/utils/vts/include/composer-vts/2.3/ComposerVts.h

@@ -32,11 +32,11 @@ namespace composer {
 namespace V2_3 {
 namespace vts {
 
+using common::V1_1::PixelFormat;
 using common::V1_1::RenderIntent;
 using common::V1_2::ColorMode;
 using common::V1_2::Dataspace;
 using common::V1_2::Hdr;
-using common::V1_2::PixelFormat;
 using V2_1::Display;
 using V2_1::Error;
 using V2_3::IComposer;

graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp

@@ -36,10 +36,10 @@ namespace vts {
 namespace {
 
 using common::V1_0::BufferUsage;
+using common::V1_1::PixelFormat;
 using common::V1_1::RenderIntent;
 using common::V1_2::ColorMode;
 using common::V1_2::Dataspace;
-using common::V1_2::PixelFormat;
 using mapper::V2_0::IMapper;
 using mapper::V2_0::vts::Gralloc;
 
@@ -492,6 +492,9 @@ TEST_F(GraphicsComposerHidlTest, SetLayerColorTransform) {
 }
 
 TEST_F(GraphicsComposerHidlTest, GetDisplayedContentSamplingAttributes) {
+    using common::V1_1::PixelFormat;
+    using common::V1_2::Dataspace;
+
     int constexpr invalid = -1;
     auto format = static_cast<PixelFormat>(invalid);
     auto dataspace = static_cast<Dataspace>(invalid);