Merge "audioflinger: pass return code up from startClient" into oc-mr1-dev (90153cae) · Commits · e / os / android_frameworks_av

services/audioflinger/Threads.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7633,6 +7633,10 @@ status_t AudioFlinger::MmapThread::start(const AudioClient& client,
	return NO_ERROR;		return NO_ERROR;
	}		}

			if (!isOutput() && !recordingAllowed(client.packageName, client.clientPid, client.clientUid)) {
			return PERMISSION_DENIED;
			}

	audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE;		audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE;

	audio_io_handle_t io = mId;		audio_io_handle_t io = mId;

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -92,7 +92,7 @@ aaudio_result_t AAudioServiceStreamMMAP::start() {

	aaudio_result_t result = AAudioServiceStreamBase::start();		aaudio_result_t result = AAudioServiceStreamBase::start();
	if (!mInService && result == AAUDIO_OK) {		if (!mInService && result == AAUDIO_OK) {
	startClient(mMmapClient, &mClientHandle);		result = startClient(mMmapClient, &mClientHandle);
	}		}
	return result;		return result;
	}		}
	@@ -107,7 +107,7 @@ aaudio_result_t AAudioServiceStreamMMAP::pause() {
	aaudio_result_t result = AAudioServiceStreamBase::pause();		aaudio_result_t result = AAudioServiceStreamBase::pause();
	// TODO put before base::pause()?		// TODO put before base::pause()?
	if (!mInService) {		if (!mInService) {
	stopClient(mClientHandle);		(void) stopClient(mClientHandle);
	}		}
	return result;		return result;
	}		}
	@@ -119,7 +119,7 @@ aaudio_result_t AAudioServiceStreamMMAP::stop() {
	aaudio_result_t result = AAudioServiceStreamBase::stop();		aaudio_result_t result = AAudioServiceStreamBase::stop();
	// TODO put before base::stop()?		// TODO put before base::stop()?
	if (!mInService) {		if (!mInService) {
	stopClient(mClientHandle);		(void) stopClient(mClientHandle);
	}		}
	return result;		return result;
	}		}