diff options
| author | Kevin DuBois <kevindubois@google.com> | 2019-01-25 17:06:01 +0000 |
|---|---|---|
| committer | Kevin DuBois <kevindubois@google.com> | 2019-01-25 17:06:01 +0000 |
| commit | e2f69f22289ffadc8dcfdbb476422e194442253a (patch) | |
| tree | 6256e77d810bbca3a1dc13e928946cc8f323eeff /configstore | |
| parent | 97e1a932ec52ce49e4c51527a6fce78bfa810294 (diff) | |
Revert "graphics.common: add HSV format definition to 1.2"
This reverts commit 97e1a932ec52ce49e4c51527a6fce78bfa810294.
Reason for revert: broke build
Change-Id: Ib264957e9a1de83c37e4129471b3c75522e21d08
Diffstat (limited to 'configstore')
| -rw-r--r-- | configstore/1.2/ISurfaceFlingerConfigs.hal | 2 | ||||
| -rw-r--r-- | configstore/1.2/default/SurfaceFlingerConfigs.cpp | 2 | ||||
| -rw-r--r-- | configstore/1.2/vts/functional/VtsHalConfigstoreV1_2TargetTest.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configstore/1.2/ISurfaceFlingerConfigs.hal b/configstore/1.2/ISurfaceFlingerConfigs.hal index 431b3fc479..7e5f706c02 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.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; diff --git a/configstore/1.2/default/SurfaceFlingerConfigs.cpp b/configstore/1.2/default/SurfaceFlingerConfigs.cpp index 714442bd22..d38b402889 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 d7f4dcf75f..881b591284 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::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()) |