diff options
| author | 2019-12-18 18:32:51 +0000 | |
|---|---|---|
| committer | 2019-12-18 18:32:51 +0000 | |
| commit | 94e6ccce782a94f09a2b9cc8c9956216cc39e78b (patch) | |
| tree | 4e1a5efb8f28f9a48d9c224f7901e3eb4e5765a1 | |
| parent | 183d82c72e0681c60d2cb6545432bf167c5f077d (diff) | |
| parent | 40e0ff592b196ec350d161e494222a71bef814e5 (diff) | |
Merge "Update tests for AIDL types."
| -rw-r--r-- | services/surfaceflinger/tests/CommonTypes_test.cpp | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/services/surfaceflinger/tests/CommonTypes_test.cpp b/services/surfaceflinger/tests/CommonTypes_test.cpp index a3e16f91b9..ab4af09fac 100644 --- a/services/surfaceflinger/tests/CommonTypes_test.cpp +++ b/services/surfaceflinger/tests/CommonTypes_test.cpp @@ -100,21 +100,21 @@ static_assert(static_cast<uint32_t>(AidlDataspace::RANGE_LIMITED) == static_cast<uint32_t>(HidlDataspace::RANGE_LIMITED)); static_assert(static_cast<uint32_t>(AidlDataspace::RANGE_EXTENDED) == static_cast<uint32_t>(HidlDataspace::RANGE_EXTENDED)); -static_assert(static_cast<uint32_t>(AidlDataspace::V0_SRGB_LINEAR) == +static_assert(static_cast<uint32_t>(AidlDataspace::SRGB_LINEAR) == static_cast<uint32_t>(HidlDataspace::V0_SRGB_LINEAR)); -static_assert(static_cast<uint32_t>(AidlDataspace::V0_SCRGB_LINEAR) == +static_assert(static_cast<uint32_t>(AidlDataspace::SCRGB_LINEAR) == static_cast<uint32_t>(HidlDataspace::V0_SCRGB_LINEAR)); -static_assert(static_cast<uint32_t>(AidlDataspace::V0_SRGB) == +static_assert(static_cast<uint32_t>(AidlDataspace::SRGB) == static_cast<uint32_t>(HidlDataspace::V0_SRGB)); -static_assert(static_cast<uint32_t>(AidlDataspace::V0_SCRGB) == +static_assert(static_cast<uint32_t>(AidlDataspace::SCRGB) == static_cast<uint32_t>(HidlDataspace::V0_SCRGB)); -static_assert(static_cast<uint32_t>(AidlDataspace::V0_JFIF) == +static_assert(static_cast<uint32_t>(AidlDataspace::JFIF) == static_cast<uint32_t>(HidlDataspace::V0_JFIF)); -static_assert(static_cast<uint32_t>(AidlDataspace::V0_BT601_625) == +static_assert(static_cast<uint32_t>(AidlDataspace::BT601_625) == static_cast<uint32_t>(HidlDataspace::V0_BT601_625)); -static_assert(static_cast<uint32_t>(AidlDataspace::V0_BT601_525) == +static_assert(static_cast<uint32_t>(AidlDataspace::BT601_525) == static_cast<uint32_t>(HidlDataspace::V0_BT601_525)); -static_assert(static_cast<uint32_t>(AidlDataspace::V0_BT709) == +static_assert(static_cast<uint32_t>(AidlDataspace::BT709) == static_cast<uint32_t>(HidlDataspace::V0_BT709)); static_assert(static_cast<uint32_t>(AidlDataspace::DCI_P3_LINEAR) == static_cast<uint32_t>(HidlDataspace::DCI_P3_LINEAR)); @@ -152,19 +152,3 @@ static_assert(static_cast<uint32_t>(AidlDataspace::JPEG_APP_SEGMENTS) == static_cast<uint32_t>(HidlDataspace::JPEG_APP_SEGMENTS)); static_assert(static_cast<uint32_t>(AidlDataspace::HEIF) == static_cast<uint32_t>(HidlDataspace::HEIF)); - -// Below are the dataspaces that have been deprecated for sometime. They are required to behave -// the same as their V0_* counterparts. We redefined them in AIDL to be the same as the -// their V0_* counterparts. -static_assert(static_cast<uint32_t>(AidlDataspace::SRGB_LINEAR) == - static_cast<uint32_t>(AidlDataspace::V0_SRGB_LINEAR)); -static_assert(static_cast<uint32_t>(AidlDataspace::SRGB) == - static_cast<uint32_t>(AidlDataspace::V0_SRGB)); -static_assert(static_cast<uint32_t>(AidlDataspace::JFIF) == - static_cast<uint32_t>(AidlDataspace::V0_JFIF)); -static_assert(static_cast<uint32_t>(AidlDataspace::BT601_625) == - static_cast<uint32_t>(AidlDataspace::V0_BT601_625)); -static_assert(static_cast<uint32_t>(AidlDataspace::BT601_525) == - static_cast<uint32_t>(AidlDataspace::V0_BT601_525)); -static_assert(static_cast<uint32_t>(AidlDataspace::BT709) == - static_cast<uint32_t>(AidlDataspace::V0_BT709)); |