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

Commit 7b171c2a authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev

parents c20c484b 549a2ebb

media/ndk/NdkImage.cpp

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ media_status_t AImage::lockImage() { 
        return AMEDIA_ERROR_INVALID_OBJECT;

    }



    if ((mUsage0 & AHARDWAREBUFFER_USAGE0_CPU_READ_OFTEN) == 0) {

    if ((mUsage0 & AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN) == 0) {

        ALOGE("%s: AImage %p does not have any software read usage bits set, usage=%" PRIu64 "",

              __FUNCTION__, this, mUsage0);

        return AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE;

media/ndk/NdkImageReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ media_status_t AImageReader_new( 
        /*out*/AImageReader** reader) {

    ALOGV("%s", __FUNCTION__);

    return AImageReader_newWithUsage(

            width, height, format, AHARDWAREBUFFER_USAGE0_CPU_READ_OFTEN, 0, maxImages, reader);

            width, height, format, AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN, 0, maxImages, reader);

}



EXPORT