summaryrefslogtreecommitdiff
path: root/configstore
diff options
context:
space:
mode:
authorKevin DuBois <kevindubois@google.com>2019-01-22 10:22:37 -0800
committerKevin DuBois <kevindubois@google.com>2019-01-24 10:05:28 -0800
commit97e1a932ec52ce49e4c51527a6fce78bfa810294 (patch)
treeb1cc289bc01aa7708a4d272ab78b909df152eead /configstore
parent62da080e00a1f76b9a230206da5042e64b7f58a3 (diff)
graphics.common: add HSV format definition to 1.2
Adds HSV format used in some color sampling engines to the list of pixel formats. Rev the sampling engine in composer to reference the new format revision. Test: built image, with new format reported in vendor code. Test: VtsHalGraphicsComposerV2_3TargetTest Fixes: 122943743 Change-Id: I1b454a86f464f38e3c2cbeef5379a187ff38ab06
Diffstat (limited to 'configstore')
-rw-r--r--configstore/1.2/ISurfaceFlingerConfigs.hal2
-rw-r--r--configstore/1.2/default/SurfaceFlingerConfigs.cpp2
-rw-r--r--configstore/1.2/vts/functional/VtsHalConfigstoreV1_2TargetTest.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/configstore/1.2/ISurfaceFlingerConfigs.hal b/configstore/1.2/ISurfaceFlingerConfigs.hal
index 7e5f706c02..431b3fc479 100644
--- a/configstore/1.2/ISurfaceFlingerConfigs.hal
+++ b/configstore/1.2/ISurfaceFlingerConfigs.hal
@@ -15,7 +15,7 @@
*/
package android.hardware.configstore@1.2;
-import android.hardware.graphics.common@1.1::PixelFormat;
+import android.hardware.graphics.common@1.2::PixelFormat;
import android.hardware.graphics.common@1.2::Dataspace;
import @1.1::ISurfaceFlingerConfigs;
import @1.0::OptionalBool;
diff --git a/configstore/1.2/default/SurfaceFlingerConfigs.cpp b/configstore/1.2/default/SurfaceFlingerConfigs.cpp
index d38b402889..714442bd22 100644
--- a/configstore/1.2/default/SurfaceFlingerConfigs.cpp
+++ b/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) {
diff --git a/configstore/1.2/vts/functional/VtsHalConfigstoreV1_2TargetTest.cpp b/configstore/1.2/vts/functional/VtsHalConfigstoreV1_2TargetTest.cpp
index 881b591284..d7f4dcf75f 100644
--- a/configstore/1.2/vts/functional/VtsHalConfigstoreV1_2TargetTest.cpp
+++ b/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::ISurfaceFlingerConfigs;
using ::android::hardware::configstore::V1_2::DisplayPrimaries;
-using ::android::hardware::graphics::common::V1_1::PixelFormat;
+using ::android::hardware::configstore::V1_2::ISurfaceFlingerConfigs;
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())