Merge "AudioFlinger: mute mic on primary HAL only" am: bf2645b081 (b406cc33) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+18 −14

Original line number	Diff line number	Diff line
		@@ -1175,15 +1175,21 @@ status_t AudioFlinger::setMicMute(bool state)
		}

		AutoMutex lock(mHardwareLock);
		sp<DeviceHalInterface> primaryDev = mPrimaryHardwareDev->hwDevice();
		if (primaryDev == nullptr) {
		ALOGW("%s: no primary HAL device", __func__);
		return INVALID_OPERATION;
		}
		mHardwareStatus = AUDIO_HW_SET_MIC_MUTE;
		ret = primaryDev->setMicMute(state);
		for (size_t i = 0; i < mAudioHwDevs.size(); i++) {
		sp<DeviceHalInterface> dev = mAudioHwDevs.valueAt(i)->hwDevice();
		status_t result = dev->setMicMute(state);
		if (result != NO_ERROR) {
		ret = result;
		if (dev != primaryDev) {
		(void)dev->setMicMute(state);
		}
		}
		mHardwareStatus = AUDIO_HW_IDLE;
		ALOGW_IF(ret != NO_ERROR, "%s: error %d setting state to HAL", __func__, ret);
		return ret;
		}

		@@ -1193,20 +1199,18 @@ bool AudioFlinger::getMicMute() const
		if (ret != NO_ERROR) {
		return false;
		}
		bool mute = true;
		bool state = AUDIO_MODE_INVALID;
		AutoMutex lock(mHardwareLock);
		mHardwareStatus = AUDIO_HW_GET_MIC_MUTE;
		for (size_t i = 0; i < mAudioHwDevs.size(); i++) {
		sp<DeviceHalInterface> dev = mAudioHwDevs.valueAt(i)->hwDevice();
		status_t result = dev->getMicMute(&state);
		if (result == NO_ERROR) {
		mute = mute && state;
		}
		sp<DeviceHalInterface> primaryDev = mPrimaryHardwareDev->hwDevice();
		if (primaryDev == nullptr) {
		ALOGW("%s: no primary HAL device", __func__);
		return false;
		}
		bool state;
		mHardwareStatus = AUDIO_HW_GET_MIC_MUTE;
		ret = primaryDev->getMicMute(&state);
		mHardwareStatus = AUDIO_HW_IDLE;

		return mute;
		ALOGE_IF(ret != NO_ERROR, "%s: error %d getting state from HAL", __func__, ret);
		return (ret == NO_ERROR) && state;
		}

		void AudioFlinger::setRecordSilenced(uid_t uid, bool silenced)