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

Commit 03a62829 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera HAL Vts : Fix usage flag combination during gralloc allocation."... 

Merge "Camera HAL Vts : Fix usage flag combination during gralloc allocation." into stage-aosp-rvc-ts-dev am: 7cc876ee am: 314611d1 am: 4181fe23

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12173503

Change-Id: I5dd4ed3ffb25a1f8c39f59e4cfe089d373b47e86
parents fbefe777 4181fe23

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+6 −3
Original line number Original line Diff line number Diff line
@@ -4453,8 +4453,11 @@ void CameraHidlTest::processCaptureRequestInternal(uint64_t bufferUsage, 
                            nullptr};

                            nullptr};

        } else {

        } else {

            allocateGraphicBuffer(testStream.width, testStream.height,

            allocateGraphicBuffer(testStream.width, testStream.height,

                    android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage,

                                  /* We don't look at halStreamConfig.streams[0].consumerUsage

                        halStreamConfig.streams[0].consumerUsage),

                                   * since that is 0 for output streams

                                   */

                                  android_convertGralloc1To0Usage(

                                          halStreamConfig.streams[0].producerUsage, bufferUsage),

                                  halStreamConfig.streams[0].overrideFormat, &buffer_handle);

                                  halStreamConfig.streams[0].overrideFormat, &buffer_handle);

            outputBuffer = {halStreamConfig.streams[0].id,

            outputBuffer = {halStreamConfig.streams[0].id,

                            bufferId,

                            bufferId,