Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 526fd4a4 authored by Chia-I Wu's avatar Chia-I Wu Committed by Android (Google) Code Review
Browse files

Merge "Use android.hardware.graphics.common@1.0"

parents 0b17f9f5 5901fda2

include/ui/GrallocAllocator.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,12 +27,12 @@ namespace android { 
namespace Gralloc2 {

namespace Gralloc2 {





using hardware::graphics::allocator::V2_0::Error;

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::ProducerUsage;

using hardware::graphics::allocator::V2_0::ConsumerUsage;

using hardware::graphics::allocator::V2_0::ConsumerUsage;

using hardware::graphics::allocator::V2_0::BufferDescriptor;

using hardware::graphics::allocator::V2_0::BufferDescriptor;

using hardware::graphics::allocator::V2_0::Buffer;

using hardware::graphics::allocator::V2_0::Buffer;

using hardware::graphics::allocator::V2_0::IAllocator;

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.

// Allocator is a wrapper to IAllocator, a proxy to server-side allocator.

class Allocator {

class Allocator {

include/ui/GrallocMapper.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,9 +27,9 @@ namespace android { 
namespace Gralloc2 {

namespace Gralloc2 {





using hardware::graphics::allocator::V2_0::Error;

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::ProducerUsage;

using hardware::graphics::allocator::V2_0::ConsumerUsage;

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::FlexLayout;

using hardware::graphics::mapper::V2_0::BackingStore;

using hardware::graphics::mapper::V2_0::BackingStore;

using hardware::graphics::mapper::V2_0::Device;

using hardware::graphics::mapper::V2_0::Device;

services/surfaceflinger/DisplayHardware/ComposerHal.h

+6 −7
Original line number Original line Diff line number Diff line
@@ -27,7 +27,12 @@ namespace android { 




namespace Hwc2 {

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::IComposer;

using android::hardware::graphics::composer::V2_1::IComposerCallback;

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::Layer;

using android::hardware::graphics::composer::V2_1::Config;

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.

// Composer is a wrapper to IComposer, a proxy to server-side composer.

class Composer {

class Composer {

public:

public: