Use android.hardware.graphics.common@1.0

Some types in composer@2.1 and allocator@2.0 are now in common@1.0.

Test: builds and boots
Change-Id: Ied8e5d1b555cd6bfd2c0381cec537293900d3ffe

diff --git a/include/ui/GrallocAllocator.h b/include/ui/GrallocAllocator.h
index 23b78ed..e3c4248 100644 (file)
--- a/include/ui/GrallocAllocator.h
+++ b/include/ui/GrallocAllocator.h
@@ -27,12 +27,12 @@ namespace android {
 namespace Gralloc2 {
 
 using hardware::graphics::allocator::V2_0::Error;
-using hardware::graphics::allocator::V2_0::PixelFormat;
 using hardware::graphics::allocator::V2_0::ProducerUsage;
 using hardware::graphics::allocator::V2_0::ConsumerUsage;
 using hardware::graphics::allocator::V2_0::BufferDescriptor;
 using hardware::graphics::allocator::V2_0::Buffer;
 using hardware::graphics::allocator::V2_0::IAllocator;
+using hardware::graphics::common::V1_0::PixelFormat;
 
 // Allocator is a wrapper to IAllocator, a proxy to server-side allocator.
 class Allocator {

diff --git a/include/ui/GrallocMapper.h b/include/ui/GrallocMapper.h
index 868fd14..99d2837 100644 (file)
--- a/include/ui/GrallocMapper.h
+++ b/include/ui/GrallocMapper.h
@@ -27,9 +27,9 @@ namespace android {
 namespace Gralloc2 {
 
 using hardware::graphics::allocator::V2_0::Error;
-using hardware::graphics::allocator::V2_0::PixelFormat;
 using hardware::graphics::allocator::V2_0::ProducerUsage;
 using hardware::graphics::allocator::V2_0::ConsumerUsage;
+using hardware::graphics::common::V1_0::PixelFormat;
 using hardware::graphics::mapper::V2_0::FlexLayout;
 using hardware::graphics::mapper::V2_0::BackingStore;
 using hardware::graphics::mapper::V2_0::Device;

diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.h b/services/surfaceflinger/DisplayHardware/ComposerHal.h
index fd74a92..b8f7c20 100644 (file)
--- a/services/surfaceflinger/DisplayHardware/ComposerHal.h
+++ b/services/surfaceflinger/DisplayHardware/ComposerHal.h
@@ -27,7 +27,12 @@ namespace android {
 
 namespace Hwc2 {
 
-using android::hardware::graphics::allocator::V2_0::PixelFormat;
+using android::hardware::graphics::common::V1_0::ColorMode;
+using android::hardware::graphics::common::V1_0::ColorTransform;
+using android::hardware::graphics::common::V1_0::Dataspace;
+using android::hardware::graphics::common::V1_0::Hdr;
+using android::hardware::graphics::common::V1_0::PixelFormat;
+using android::hardware::graphics::common::V1_0::Transform;
 
 using android::hardware::graphics::composer::V2_1::IComposer;
 using android::hardware::graphics::composer::V2_1::IComposerCallback;
@@ -36,12 +41,6 @@ using android::hardware::graphics::composer::V2_1::Display;
 using android::hardware::graphics::composer::V2_1::Layer;
 using android::hardware::graphics::composer::V2_1::Config;
 
-using android::hardware::graphics::composer::V2_1::ColorMode;
-using android::hardware::graphics::composer::V2_1::Hdr;
-using android::hardware::graphics::composer::V2_1::Dataspace;
-using android::hardware::graphics::composer::V2_1::ColorTransform;
-using android::hardware::graphics::composer::V2_1::Transform;
-
 // Composer is a wrapper to IComposer, a proxy to server-side composer.
 class Composer {
 public: