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

Commit b54af926 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Don't reject "thumbnail mode" setConfig" into lmp-dev

parents 2b9a3e13 e0eb0ef6

media/libmedia/IOMX.cpp

+5 −2
Original line number Diff line number Diff line
@@ -624,7 +624,9 @@ status_t BnOMX::onTransact( 
            void *params = NULL;

            size_t pageSize = 0;

            size_t allocSize = 0;

            if (code != SET_INTERNAL_OPTION && size < 8) {

            // this only applies to a subset of devices, and was obsoleted in M

            bool mightBeThumbnailMode = (code == SET_CONFIG && size == sizeof(OMX_BOOL));

            if (!mightBeThumbnailMode && (code != SET_INTERNAL_OPTION && size < 8)) {

                // we expect the structure to contain at least the size and

                // version, 8 bytes total

                ALOGE("b/27207275 (%zu)", size);
@@ -646,7 +648,8 @@ status_t BnOMX::onTransact( 
                    } else {

                        err = NOT_ENOUGH_DATA;

                        OMX_U32 declaredSize = *(OMX_U32*)params;

                        if (code != SET_INTERNAL_OPTION && declaredSize > size) {

                        if (!mightBeThumbnailMode &&

                                code != SET_INTERNAL_OPTION && declaredSize > size) {

                            // the buffer says it's bigger than it actually is

                            ALOGE("b/27207275 (%u/%zu)", declaredSize, size);

                            android_errorWriteLog(0x534e4554, "27207275");