Merge PPR2.181005.003 from pi-release-2 into pi-platform-release. (dc3d7f5b) · Commits · e / devices / smdk4412 / android_frameworks_av

drm/libmediadrm/ICrypto.cpp

+7 −2

Original line number	Diff line number	Diff line
		@@ -225,8 +225,13 @@ IMPLEMENT_META_INTERFACE(Crypto, "android.hardware.ICrypto");

		void BnCrypto::readVector(const Parcel &data, Vector<uint8_t> &vector) const {
		uint32_t size = data.readInt32();
		vector.insertAt((size_t)0, size);
		data.read(vector.editArray(), size);
		if (vector.insertAt((size_t)0, size) < 0) {
		vector.clear();
		}
		if (data.read(vector.editArray(), size) != NO_ERROR) {
		vector.clear();
		android_errorWriteWithInfoLog(0x534e4554, "62872384", -1, NULL, 0);
		}
		}

		void BnCrypto::writeVector(Parcel *reply, Vector<uint8_t> const &vector) const {

+7 −1

Original line number	Diff line number	Diff line
		@@ -811,7 +811,13 @@ AMediaCodecCryptoInfo *AMediaCodecCryptoInfo_new(
		size_t *encryptedbytes) {

		// size needed to store all the crypto data
		size_t cryptosize = sizeof(AMediaCodecCryptoInfo) + sizeof(size_t) * numsubsamples * 2;
		size_t cryptosize;
		// = sizeof(AMediaCodecCryptoInfo) + sizeof(size_t) * numsubsamples * 2;
		if (__builtin_mul_overflow(sizeof(size_t) * 2, numsubsamples, &cryptosize) \|\|
		__builtin_add_overflow(cryptosize, sizeof(AMediaCodecCryptoInfo), &cryptosize)) {
		ALOGE("crypto size overflow");
		return NULL;
		}
		AMediaCodecCryptoInfo ret = (AMediaCodecCryptoInfo) malloc(cryptosize);
		if (!ret) {
		ALOGE("couldn't allocate %zu bytes", cryptosize);

+15 −5

Original line number	Diff line number	Diff line
		@@ -861,6 +861,21 @@ status_t AudioPolicyManager::getOutputForAttr(const audio_attributes_t *attr,
		flags = (audio_output_flags_t)(flags \| AUDIO_OUTPUT_FLAG_HW_AV_SYNC);
		}

		// Set incall music only if device was explicitly set, and fallback to the device which is
		// chosen by the engine if not.
		// FIXME: provide a more generic approach which is not device specific and move this back
		// to getOutputForDevice.
		if (device == AUDIO_DEVICE_OUT_TELEPHONY_TX &&
		*stream == AUDIO_STREAM_MUSIC &&
		audio_is_linear_pcm(config->format) &&
		isInCall()) {
		if (*selectedDeviceId != AUDIO_PORT_HANDLE_NONE) {
		*flags = (audio_output_flags_t)AUDIO_OUTPUT_FLAG_INCALL_MUSIC;
		} else {
		device = mEngine->getDeviceForStrategy(strategy);
		}
		}

		ALOGV("getOutputForAttr() device 0x%x, sampling rate %d, format %#x, channel mask %#x, "
		"flags %#x",
		device, config->sample_rate, config->format, config->channel_mask, *flags);
		@@ -916,11 +931,6 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevice(
		*flags = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_VOIP_RX \|
		AUDIO_OUTPUT_FLAG_DIRECT);
		ALOGV("Set VoIP and Direct output flags for PCM format");
		} else if (device == AUDIO_DEVICE_OUT_TELEPHONY_TX &&
		stream == AUDIO_STREAM_MUSIC &&
		audio_is_linear_pcm(config->format) &&
		isInCall()) {
		*flags = (audio_output_flags_t)AUDIO_OUTPUT_FLAG_INCALL_MUSIC;
		}