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

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

Merge cherrypicks of [10745155, 10743283, 10746098, 10735615, 10743284,... 

Merge cherrypicks of [10745155, 10743283, 10746098, 10735615, 10743284, 10745369, 10745156, 10745157, 10746136, 10746137, 10745215, 10746138, 10745216, 10745217, 10746139, 10745218, 10743285, 10746118, 10746119, 10745827, 10745158, 10745159, 10743224, 10743225, 10745492] into qt-qpr2-release

Change-Id: Ieb0e477c7cae035ff2a04f526f1d1fe4d286231f
parents 674ce236 63889889

drm/libmediadrm/ICrypto.cpp

+11 −3
Original line number Diff line number Diff line
@@ -264,8 +264,12 @@ status_t BnCrypto::onTransact( 
        {

            CHECK_INTERFACE(ICrypto, data, reply);



            uint8_t uuid[16];

            data.read(uuid, sizeof(uuid));

            uint8_t uuid[16] = {0};

            if (data.read(uuid, sizeof(uuid)) != NO_ERROR) {

                android_errorWriteLog(0x534e4554, "144767096");

                reply->writeInt32(BAD_VALUE);

                return OK;

            }



            size_t opaqueSize = data.readInt32();

            void *opaqueData = NULL;
@@ -280,7 +284,11 @@ status_t BnCrypto::onTransact( 
                return NO_MEMORY;

            }



            data.read(opaqueData, opaqueSize);

            if (data.read(opaqueData, opaqueSize) != NO_ERROR) {

                android_errorWriteLog(0x534e4554, "144767096");

                reply->writeInt32(BAD_VALUE);

                return OK;

            }

            reply->writeInt32(createPlugin(uuid, opaqueData, opaqueSize));



            free(opaqueData);

services/camera/libcameraservice/utils/ExifUtils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -603,13 +603,13 @@ bool ExifUtilsImpl::setGpsTimestamp(const struct tm& t) { 
}



bool ExifUtilsImpl::setImageHeight(uint32_t length) {

    SET_LONG(EXIF_IFD_0, EXIF_TAG_IMAGE_LENGTH, length);

    SET_SHORT(EXIF_IFD_0, EXIF_TAG_IMAGE_LENGTH, length);

    SET_LONG(EXIF_IFD_EXIF, EXIF_TAG_PIXEL_Y_DIMENSION, length);

    return true;

}



bool ExifUtilsImpl::setImageWidth(uint32_t width) {

    SET_LONG(EXIF_IFD_0, EXIF_TAG_IMAGE_WIDTH, width);

    SET_SHORT(EXIF_IFD_0, EXIF_TAG_IMAGE_WIDTH, width);

    SET_LONG(EXIF_IFD_EXIF, EXIF_TAG_PIXEL_X_DIMENSION, width);

    return true;

}