Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" (f3685dda) · Commits · e / os / android_frameworks_av

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);

+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;
		}