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

Commit 17757547 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6610691 from fda88150 to rvc-release 

Change-Id: I20d57bb3956a421f53cdd3d03492cd8c4051140d
parents 6a537544 fda88150

automotive/evs/1.1/types.hal

+4 −0
Original line number Diff line number Diff line
@@ -105,6 +105,10 @@ enum EvsEventType : uint32_t { 
     * Master role has become available

     */

    MASTER_RELEASED,

    /**

     * Any other erroneous streaming events

     */

    STREAM_ERROR,

};



/**

automotive/vehicle/2.0/types.hal

+18 −2
Original line number Diff line number Diff line
@@ -4280,6 +4280,16 @@ enum UserFlags: int32_t { 
     * Admin users have additional privileges such as permission to create other users.

     */

    ADMIN = 0x08,



    /**

     * Disabled users are marked for deletion.

     */

    DISABLED = 0x10,



     /**

     * Profile user is a profile of another user.

     */

    PROFILE = 0x20,

};



/**
@@ -4294,10 +4304,16 @@ struct UsersInfo { 
    /** The current foreground user. */

    UserInfo currentUser;



    /** Number of existing users (includes the current user). */

    /**

     * Number of existing users; includes the current user, recently removed users (with DISABLED

     * flag), and profile users (with PROFILE flag).

     */

    int32_t numberUsers;



    /** List of existing users (includes the current user). */

    /**

     * List of existing users; includes the current user, recently removed users (with DISABLED

     * flag), and profile users (with PROFILE flag).

     */

    vec<UserInfo> existingUsers;

 };

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ ca515ff4b63c80cf5ad7b3395c997c57d6c56157361f6c367d1c96f23cc4860a android.hardwar 
87958d728d7c0ee9b9391ab4a072b097914921a7b38f7dc3df427f933a5b528e android.hardware.automotive.evs@1.1::IEvsEnumerator

f53b4e8de6209c6d0fa9036005671b34a2f98328b51423d3a5137a43bf42c84d android.hardware.automotive.evs@1.1::IEvsUltrasonicsArray

0460bacbde906a846a3d71b2b7b33d6927cac3ff072e523ffac7853577464406 android.hardware.automotive.evs@1.1::IEvsUltrasonicsArrayStream

3e374b5c4777f959f62a320abb3b9edca8874e24e383dbb19c66d224f151b363 android.hardware.automotive.evs@1.1::types

f27cf8283e7b953d33dd258734749d2fca9cc63502ea41353060ffa78d8ce9f6 android.hardware.automotive.evs@1.1::types

4e4904c4067dadae974ddf90351f362331dcd04bba1d890d313cc8ba91f68c15 android.hardware.automotive.sv@1.0::ISurroundView2dSession

63336e9d03f545020ff2982ff76d9d8c44fa76ad476293b5ef6732cbbd71e61b android.hardware.automotive.sv@1.0::ISurroundView3dSession

b7015428cd52ce8192d13bfcbf2c4455cda3727d57f2aac80d65a1747104f5ac android.hardware.automotive.sv@1.0::ISurroundViewService

graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp

+18 −18
Original line number Diff line number Diff line
@@ -587,8 +587,8 @@ TEST_P(GraphicsMapperHidlTest, LockUnlockBasic) { 
                               static_cast<int32_t>(info.height)};

    unique_fd fence;

    uint8_t* data;

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(

                                    mGralloc->lock(bufferHandle, info.usage, region, fence.get())));

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage,

                                                                        region, fence.release())));



    // RGBA_8888

    fillRGBA8888(data, info.height, stride * 4, info.width * 4);
@@ -596,8 +596,8 @@ TEST_P(GraphicsMapperHidlTest, LockUnlockBasic) { 
    ASSERT_NO_FATAL_FAILURE(fence.reset(mGralloc->unlock(bufferHandle)));



    // lock again for reading

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(

                                    mGralloc->lock(bufferHandle, info.usage, region, fence.get())));

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage,

                                                                        region, fence.release())));



    ASSERT_NO_FATAL_FAILURE(

            verifyRGBA8888(bufferHandle, data, info.height, stride * 4, info.width * 4));
@@ -627,8 +627,8 @@ TEST_P(GraphicsMapperHidlTest, Lock_YCRCB_420_SP) { 
    unique_fd fence;

    uint8_t* data;



    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(

                                    mGralloc->lock(bufferHandle, info.usage, region, fence.get())));

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage,

                                                                        region, fence.release())));



    android_ycbcr yCbCr;

    int64_t hSubsampling = 0;
@@ -650,8 +650,8 @@ TEST_P(GraphicsMapperHidlTest, Lock_YCRCB_420_SP) { 
    ASSERT_NO_FATAL_FAILURE(fence.reset(mGralloc->unlock(bufferHandle)));



    // lock again for reading

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(

                                    mGralloc->lock(bufferHandle, info.usage, region, fence.get())));

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage,

                                                                        region, fence.release())));



    ASSERT_NO_FATAL_FAILURE(

            getAndroidYCbCr(bufferHandle, data, &yCbCr, &hSubsampling, &vSubsampling));
@@ -676,8 +676,8 @@ TEST_P(GraphicsMapperHidlTest, Lock_YV12) { 
    unique_fd fence;

    uint8_t* data;



    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(

                                    mGralloc->lock(bufferHandle, info.usage, region, fence.get())));

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage,

                                                                        region, fence.release())));



    android_ycbcr yCbCr;

    int64_t hSubsampling = 0;
@@ -699,8 +699,8 @@ TEST_P(GraphicsMapperHidlTest, Lock_YV12) { 
    ASSERT_NO_FATAL_FAILURE(fence.reset(mGralloc->unlock(bufferHandle)));



    // lock again for reading

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(

                                    mGralloc->lock(bufferHandle, info.usage, region, fence.get())));

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage,

                                                                        region, fence.release())));



    ASSERT_NO_FATAL_FAILURE(

            getAndroidYCbCr(bufferHandle, data, &yCbCr, &hSubsampling, &vSubsampling));
@@ -725,8 +725,8 @@ TEST_P(GraphicsMapperHidlTest, Lock_YCBCR_420_888) { 
    unique_fd fence;

    uint8_t* data;



    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(

                                    mGralloc->lock(bufferHandle, info.usage, region, fence.get())));

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage,

                                                                        region, fence.release())));



    android_ycbcr yCbCr;

    int64_t hSubsampling = 0;
@@ -743,8 +743,8 @@ TEST_P(GraphicsMapperHidlTest, Lock_YCBCR_420_888) { 
    ASSERT_NO_FATAL_FAILURE(fence.reset(mGralloc->unlock(bufferHandle)));



    // lock again for reading

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(

                                    mGralloc->lock(bufferHandle, info.usage, region, fence.get())));

    ASSERT_NO_FATAL_FAILURE(data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage,

                                                                        region, fence.release())));



    ASSERT_NO_FATAL_FAILURE(

            getAndroidYCbCr(bufferHandle, data, &yCbCr, &hSubsampling, &vSubsampling));
@@ -771,7 +771,7 @@ TEST_P(GraphicsMapperHidlTest, Lock_RAW10) { 
                               static_cast<int32_t>(info.height)};

    unique_fd fence;



    ASSERT_NO_FATAL_FAILURE(mGralloc->lock(bufferHandle, info.usage, region, fence.get()));

    ASSERT_NO_FATAL_FAILURE(mGralloc->lock(bufferHandle, info.usage, region, fence.release()));



    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE, mGralloc->get(bufferHandle, gralloc4::MetadataType_PlaneLayouts, &vec));
@@ -813,7 +813,7 @@ TEST_P(GraphicsMapperHidlTest, Lock_RAW12) { 
                               static_cast<int32_t>(info.height)};

    unique_fd fence;



    ASSERT_NO_FATAL_FAILURE(mGralloc->lock(bufferHandle, info.usage, region, fence.get()));

    ASSERT_NO_FATAL_FAILURE(mGralloc->lock(bufferHandle, info.usage, region, fence.release()));



    hidl_vec<uint8_t> vec;

    ASSERT_EQ(Error::NONE, mGralloc->get(bufferHandle, gralloc4::MetadataType_PlaneLayouts, &vec));