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

Commit 605a9f4d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "mapper: support new usage and format" into qt-dev

parents 092c9f5e 6952ddf5

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ b826892686850a9cf2b60ca5845db7185c2196ea4dd765cd80cd163169678a78 android.hardwar 
7a2d64095252f85781b2d521f4f11d04ce774544feececcec2088c568656e93c android.hardware.graphics.common@1.2::types

3dff04a36b86660b5807414587e530bb0c294ed56fdff06f8915ba0a9b73f974 android.hardware.graphics.composer@2.3::IComposer

54bc1dc874f8bc0781767786075dafd33a0796c1eea7d2317231b8929280e946 android.hardware.graphics.composer@2.3::IComposerClient

5c8bf8e1af9efe225a4661db8c08ff1b7e13fdc8ed49f35291bd0b6c9436b8f2 android.hardware.graphics.mapper@3.0::IMapper

033e096cb65e5093ee1d0e473892b9a487911d4611dbb65ebecb5cef18338923 android.hardware.graphics.mapper@3.0::IMapper

7183d9d9acfa41a61a64bdfed548e98299265a7bb1821a3ed204173b5c2cfd4a android.hardware.graphics.mapper@3.0::types

c3f831a66d5815baf74f5b82fe79cf099542ddae4dfab3f388e1d41828e794fc android.hardware.health.storage@1.0::IGarbageCollectCallback

dd1ec219f5d2e2b33c6c0bcb92e63bbedb36f7c716413462848f6b6ae74fc864 android.hardware.health.storage@1.0::IStorage

graphics/mapper/3.0/IMapper.hal

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package android.hardware.graphics.mapper@3.0;



import android.hardware.graphics.common@1.1::BufferUsage;

import android.hardware.graphics.common@1.1::PixelFormat;

import android.hardware.graphics.common@1.2::BufferUsage;

import android.hardware.graphics.common@1.2::PixelFormat;

import android.hardware.graphics.common@1.2::Rect;



interface IMapper {

graphics/mapper/3.0/vts/functional/VtsHalGraphicsMapperV3_0TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ namespace V3_0 { 
namespace vts {

namespace {



using android::hardware::graphics::common::V1_0::BufferUsage;

using android::hardware::graphics::common::V1_1::PixelFormat;

using android::hardware::graphics::common::V1_2::BufferUsage;

using android::hardware::graphics::common::V1_2::PixelFormat;



// Test environment for graphics.mapper.

class GraphicsMapperHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {