Merge cherrypicks of [10310245] into qt-qpr3-release (1d3538a5) · Commits · e / devices / smdk4412 / android_frameworks_av

drm/libmediadrm/ICrypto.cpp

+2 −11

Original line number	Diff line number	Diff line
		@@ -264,12 +264,8 @@ status_t BnCrypto::onTransact(
		{
		CHECK_INTERFACE(ICrypto, data, reply);

		uint8_t uuid[16] = {0};
		if (data.read(uuid, sizeof(uuid)) != NO_ERROR) {
		android_errorWriteLog(0x534e4554, "144767096");
		reply->writeInt32(BAD_VALUE);
		return OK;
		}
		uint8_t uuid[16];
		data.read(uuid, sizeof(uuid));

		size_t opaqueSize = data.readInt32();
		void *opaqueData = NULL;
		@@ -285,11 +281,6 @@ status_t BnCrypto::onTransact(
		}

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