From cb20ccaa611fbde0fcbade5a0b667d183c405b4f Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Fri, 22 Feb 2019 11:57:38 +0900 Subject: [PATCH] Remove dependency with configstore 1.2 The configstore 1.2 is deleted. So cut the dependency with configstore 1.2. Bug: 124531214 Test: build & boot Test: adb shell lshal | grep configstore & check configstore 1.2 Change-Id: Ic6b1875e4cf62d45176b83f69a48382c4d9c05c8 --- libs/ui/Android.bp | 3 -- libs/ui/include/ui/ConfigStoreTypes.h | 14 +++++-- libs/ui/include_vndk/ui/ConfigStoreTypes.h | 14 +++++-- services/surfaceflinger/Android.bp | 6 +-- services/surfaceflinger/Scheduler/Scheduler.cpp | 1 - services/surfaceflinger/SurfaceFlinger.cpp | 1 - .../surfaceflinger/SurfaceFlingerProperties.cpp | 45 ++-------------------- services/surfaceflinger/SurfaceFlingerProperties.h | 5 ++- 8 files changed, 31 insertions(+), 58 deletions(-) diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp index af95a05a3f..4ca1781be1 100644 --- a/libs/ui/Android.bp +++ b/libs/ui/Android.bp @@ -90,8 +90,6 @@ cc_library_shared { "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.1", "android.hardware.graphics.mapper@3.0", - "android.hardware.configstore@1.2", - "android.hardware.configstore-utils", "libbase", "libcutils", "libhardware", @@ -105,7 +103,6 @@ cc_library_shared { ], export_shared_lib_headers: [ - "android.hardware.configstore@1.2", "android.hardware.graphics.common@1.2", ], diff --git a/libs/ui/include/ui/ConfigStoreTypes.h b/libs/ui/include/ui/ConfigStoreTypes.h index 37a2bd5451..4445ae97c9 100644 --- a/libs/ui/include/ui/ConfigStoreTypes.h +++ b/libs/ui/include/ui/ConfigStoreTypes.h @@ -16,14 +16,22 @@ #pragma once -#include - // android::ui::* in this header file will alias different types as // the HIDL interface is updated. namespace android { namespace ui { -using android::hardware::configstore::V1_2::DisplayPrimaries; +struct CieXyz { + float X; + float Y; + float Z; +}; +struct DisplayPrimaries { + CieXyz red; + CieXyz green; + CieXyz blue; + CieXyz white; +}; } // namespace ui } // namespace android diff --git a/libs/ui/include_vndk/ui/ConfigStoreTypes.h b/libs/ui/include_vndk/ui/ConfigStoreTypes.h index 37a2bd5451..4445ae97c9 100644 --- a/libs/ui/include_vndk/ui/ConfigStoreTypes.h +++ b/libs/ui/include_vndk/ui/ConfigStoreTypes.h @@ -16,14 +16,22 @@ #pragma once -#include - // android::ui::* in this header file will alias different types as // the HIDL interface is updated. namespace android { namespace ui { -using android::hardware::configstore::V1_2::DisplayPrimaries; +struct CieXyz { + float X; + float Y; + float Z; +}; +struct DisplayPrimaries { + CieXyz red; + CieXyz green; + CieXyz blue; + CieXyz white; +}; } // namespace ui } // namespace android diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp index 948b689507..ac1d492adf 100644 --- a/services/surfaceflinger/Android.bp +++ b/services/surfaceflinger/Android.bp @@ -23,7 +23,6 @@ cc_defaults { "android.hardware.configstore-utils", "android.hardware.configstore@1.0", "android.hardware.configstore@1.1", - "android.hardware.configstore@1.2", "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.allocator@3.0", "android.hardware.graphics.common@1.2", @@ -188,7 +187,6 @@ cc_defaults { "android.frameworks.displayservice@1.0", "android.hardware.configstore-utils", "android.hardware.configstore@1.0", - "android.hardware.configstore@1.2", "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.allocator@3.0", "libbinder", @@ -243,13 +241,15 @@ cc_library_shared { "android.hardware.configstore-utils", "android.hardware.configstore@1.0", "android.hardware.configstore@1.1", - "android.hardware.configstore@1.2", + "android.hardware.graphics.common@1.2", "libhidlbase", "libhidltransport", "libhwbinder", + "libui", "libutils", ], export_shared_lib_headers: [ + "android.hardware.graphics.common@1.2", "libhidlbase", "libhidltransport", "libhwbinder", diff --git a/services/surfaceflinger/Scheduler/Scheduler.cpp b/services/surfaceflinger/Scheduler/Scheduler.cpp index 990318a00a..5b4af4ae2d 100644 --- a/services/surfaceflinger/Scheduler/Scheduler.cpp +++ b/services/surfaceflinger/Scheduler/Scheduler.cpp @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index d924cab97a..e50dd08738 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -109,7 +109,6 @@ #include #include -#include #include #include diff --git a/services/surfaceflinger/SurfaceFlingerProperties.cpp b/services/surfaceflinger/SurfaceFlingerProperties.cpp index e676d2098d..f2881f5542 100644 --- a/services/surfaceflinger/SurfaceFlingerProperties.cpp +++ b/services/surfaceflinger/SurfaceFlingerProperties.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include @@ -16,9 +15,9 @@ namespace android { namespace sysprop { using namespace android::hardware::configstore; using namespace android::hardware::configstore::V1_0; -using ::android::hardware::configstore::V1_2::DisplayPrimaries; -using ::android::hardware::graphics::common::V1_2::Dataspace; -using ::android::hardware::graphics::common::V1_2::PixelFormat; +using android::hardware::graphics::common::V1_2::Dataspace; +using android::hardware::graphics::common::V1_2::PixelFormat; +using android::ui::DisplayPrimaries; int64_t vsync_event_phase_offset_ns(int64_t defaultValue) { auto temp = SurfaceFlingerProperties::vsync_event_phase_offset_ns(); @@ -171,40 +170,14 @@ bool use_color_management(bool defaultValue) { tmpHasWideColorDisplay.has_value()) { return *tmpuseColorManagement || *tmpHasHDRDisplay || *tmpHasWideColorDisplay; } - auto surfaceFlingerConfigsServiceV1_2 = ISurfaceFlingerConfigs::getService(); - if (surfaceFlingerConfigsServiceV1_2) { - return getBool(defaultValue); - } return defaultValue; } -auto getCompositionPreference(sp configsServiceV1_2) { - Dataspace defaultCompositionDataspace = Dataspace::V0_SRGB; - PixelFormat defaultCompositionPixelFormat = PixelFormat::RGBA_8888; - Dataspace wideColorGamutCompositionDataspace = Dataspace::V0_SRGB; - PixelFormat wideColorGamutCompositionPixelFormat = PixelFormat::RGBA_8888; - configsServiceV1_2->getCompositionPreference( - [&](auto tmpDefaultDataspace, auto tmpDefaultPixelFormat, - auto tmpWideColorGamutDataspace, auto tmpWideColorGamutPixelFormat) { - defaultCompositionDataspace = tmpDefaultDataspace; - defaultCompositionPixelFormat = tmpDefaultPixelFormat; - wideColorGamutCompositionDataspace = tmpWideColorGamutDataspace; - wideColorGamutCompositionPixelFormat = tmpWideColorGamutPixelFormat; - }); - return std::tuple(defaultCompositionDataspace, defaultCompositionPixelFormat, - wideColorGamutCompositionDataspace, wideColorGamutCompositionPixelFormat); -} - int64_t default_composition_dataspace(Dataspace defaultValue) { auto temp = SurfaceFlingerProperties::default_composition_dataspace(); if (temp.has_value()) { return *temp; } - auto configsServiceV1_2 = V1_2::ISurfaceFlingerConfigs::getService(); - if (configsServiceV1_2) { - return static_cast(get<0>(getCompositionPreference(configsServiceV1_2))); - } return static_cast(defaultValue); } @@ -213,10 +186,6 @@ int32_t default_composition_pixel_format(PixelFormat defaultValue) { if (temp.has_value()) { return *temp; } - auto configsServiceV1_2 = V1_2::ISurfaceFlingerConfigs::getService(); - if (configsServiceV1_2) { - return static_cast(get<1>(getCompositionPreference(configsServiceV1_2))); - } return static_cast(defaultValue); } @@ -225,10 +194,6 @@ int64_t wcg_composition_dataspace(Dataspace defaultValue) { if (temp.has_value()) { return *temp; } - auto configsServiceV1_2 = V1_2::ISurfaceFlingerConfigs::getService(); - if (configsServiceV1_2) { - return static_cast(get<2>(getCompositionPreference(configsServiceV1_2))); - } return static_cast(defaultValue); } @@ -237,10 +202,6 @@ int32_t wcg_composition_pixel_format(PixelFormat defaultValue) { if (temp.has_value()) { return *temp; } - auto configsServiceV1_2 = V1_2::ISurfaceFlingerConfigs::getService(); - if (configsServiceV1_2) { - return static_cast(get<3>(getCompositionPreference(configsServiceV1_2))); - } return static_cast(defaultValue); } diff --git a/services/surfaceflinger/SurfaceFlingerProperties.h b/services/surfaceflinger/SurfaceFlingerProperties.h index c86880ebf5..991768322c 100644 --- a/services/surfaceflinger/SurfaceFlingerProperties.h +++ b/services/surfaceflinger/SurfaceFlingerProperties.h @@ -3,8 +3,9 @@ #define SURFACEFLINGERPROPERTIES_H_ #include -#include +#include #include +#include #include #include @@ -54,7 +55,7 @@ int64_t wcg_composition_dataspace( int32_t wcg_composition_pixel_format( android::hardware::graphics::common::V1_2::PixelFormat defaultValue); -android::hardware::configstore::V1_2::DisplayPrimaries getDisplayNativePrimaries(); +android::ui::DisplayPrimaries getDisplayNativePrimaries(); } // namespace sysprop } // namespace android #endif // SURFACEFLINGERPROPERTIES_H_ -- 2.11.0