audio policy: fix media volume after ringtone am: 57de36ccd1 am: f3ef8248a7 (ee4b2c9b) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1329,6 +1329,7 @@ status_t AudioPolicyManager::stopSource(const sp<AudioOutputDescriptor>& outputD

	// force restoring the device selection on other active outputs if it differs from the		// force restoring the device selection on other active outputs if it differs from the
	// one being selected for this output		// one being selected for this output
			uint32_t delayMs = outputDesc->latency()*2;
	for (size_t i = 0; i < mOutputs.size(); i++) {		for (size_t i = 0; i < mOutputs.size(); i++) {
	sp<AudioOutputDescriptor> desc = mOutputs.valueAt(i);		sp<AudioOutputDescriptor> desc = mOutputs.valueAt(i);
	if (desc != outputDesc &&		if (desc != outputDesc &&
	@@ -1340,7 +1341,11 @@ status_t AudioPolicyManager::stopSource(const sp<AudioOutputDescriptor>& outputD
	setOutputDevice(desc,		setOutputDevice(desc,
	newDevice2,		newDevice2,
	force,		force,
	outputDesc->latency()*2);		delayMs);
			// re-apply device specific volume if not done by setOutputDevice()
			if (!force) {
			applyStreamVolumes(desc, newDevice2, delayMs);
			}
	}		}
	}		}
	// update the outputs if stopping one with a stream that can affect notification routing		// update the outputs if stopping one with a stream that can affect notification routing