Merge tag 'android-7.1.0_r7' of https://android.googlesource.com/platform/frameworks/av into HEAD (c3c767dc) · Commits · e / devices / smdk4412 / android_frameworks_av

include/radio/Radio.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ public:
	private:		private:
	Radio(radio_handle_t handle,		Radio(radio_handle_t handle,
	const sp<RadioCallback>&);		const sp<RadioCallback>&);
	static const sp<IRadioService>& getRadioService();		static const sp<IRadioService> getRadioService();

	Mutex mLock;		Mutex mLock;
	sp<IRadio> mIRadio;		sp<IRadio> mIRadio;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -68,7 +68,7 @@ public:
	private:		private:
	SoundTrigger(sound_trigger_module_handle_t module,		SoundTrigger(sound_trigger_module_handle_t module,
	const sp<SoundTriggerCallback>&);		const sp<SoundTriggerCallback>&);
	static const sp<ISoundTriggerHwService>& getSoundTriggerHwService();		static const sp<ISoundTriggerHwService> getSoundTriggerHwService();

	Mutex mLock;		Mutex mLock;
	sp<ISoundTrigger> mISoundTrigger;		sp<ISoundTrigger> mISoundTrigger;

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@
	#include <time.h>		#include <time.h>
	#include <math.h>		#include <math.h>
	#include <audio_effects/effect_visualizer.h>		#include <audio_effects/effect_visualizer.h>
			#include <cutils/log.h>


	extern "C" {		extern "C" {
	@@ -599,6 +600,14 @@ int Visualizer_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize,
	} break;		} break;

	case VISUALIZER_CMD_MEASURE: {		case VISUALIZER_CMD_MEASURE: {
			if (pReplyData == NULL \|\| replySize == NULL \|\|
			replySize < (sizeof(int32_t) MEASUREMENT_COUNT)) {
			ALOGV("VISUALIZER_CMD_MEASURE() error *replySize %" PRIu32
			" < (sizeof(int32_t) * MEASUREMENT_COUNT) %" PRIu32, *replySize,
			sizeof(int32_t) * MEASUREMENT_COUNT);
			android_errorWriteLog(0x534e4554, "30229821");
			return -EINVAL;
			}
	uint16_t peakU16 = 0;		uint16_t peakU16 = 0;
	float sumRmsSquared = 0.0f;		float sumRmsSquared = 0.0f;
	uint8_t nbValidMeasurements = 0;		uint8_t nbValidMeasurements = 0;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -891,7 +891,7 @@ status_t BnDrm::onTransact(
	readVector(data, keyId);		readVector(data, keyId);
	readVector(data, message);		readVector(data, message);
	readVector(data, signature);		readVector(data, signature);
	bool match;		bool match = false;
	uint32_t result = verify(sessionId, keyId, message, signature, match);		uint32_t result = verify(sessionId, keyId, message, signature, match);
	reply->writeInt32(match);		reply->writeInt32(match);
	reply->writeInt32(result);		reply->writeInt32(result);

+29 −25

Original line number	Original line	Diff line number	Diff line
	@@ -777,7 +777,10 @@ status_t BnOMX::onTransact(
	// mark the last page as inaccessible, to avoid exploitation		// mark the last page as inaccessible, to avoid exploitation
	// of codecs that access past the end of the allocation because		// of codecs that access past the end of the allocation because
	// they didn't check the size		// they didn't check the size
	mprotect((char*)params + allocSize - pageSize, pageSize, PROT_NONE);		if (mprotect((char*)params + allocSize - pageSize, pageSize,
			PROT_NONE) != 0) {
			ALOGE("mprotect failed: %s", strerror(errno));
			} else {
	switch (code) {		switch (code) {
	case GET_PARAMETER:		case GET_PARAMETER:
	err = getParameter(node, index, params, size);		err = getParameter(node, index, params, size);
	@@ -806,6 +809,7 @@ status_t BnOMX::onTransact(
	}		}
	}		}
	}		}
			}
	} else {		} else {
	ALOGE("couldn't map: %s", strerror(errno));		ALOGE("couldn't map: %s", strerror(errno));
	}		}