Merge "audio: fix SAD and SAM inconsistent after audioserver crash" into main (192e33a3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioDeviceInventory.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -904,9 +904,14 @@ public class AudioDeviceInventory {
		}
		// device disconnected: call setDeviceConnectionState(AVAILABLE)
		res = mAudioSystem.setDeviceConnectionState(new AudioDeviceAttributes(
		di.mDeviceType,
		AudioSystem.isInputDevice(di.mDeviceType)
		? AudioDeviceAttributes.ROLE_INPUT
		: AudioDeviceAttributes.ROLE_OUTPUT,
		AudioDeviceInfo.convertInternalDeviceToDeviceType(di.mDeviceType),
		di.mDeviceAddress,
		di.mDeviceName),
		di.mDeviceName,
		di.mAudioProfiles,
		di.mAudioDescriptors),
		AudioSystem.DEVICE_STATE_AVAILABLE,
		di.mDeviceCodecFormat, false /deviceSwitch/);
		if (res == AudioSystem.AUDIO_STATUS_SERVER_DIED) {

+6 −2

Original line number	Diff line number	Diff line
		@@ -2244,7 +2244,7 @@ public class AudioService extends IAudioService.Stub
		}
		synchronized (mHdmiClientLock) {
		if (mHdmiManager != null && mHdmiTvClient != null) {
		setHdmiSystemAudioSupported(mHdmiSystemAudioSupported);
		setHdmiSystemAudioSupported(mHdmiSystemAudioSupported, true);
		}
		}

		@@ -13272,6 +13272,10 @@ public class AudioService extends IAudioService.Stub

		@Override
		public int setHdmiSystemAudioSupported(boolean on) {
		return setHdmiSystemAudioSupported(on, false);
		}

		private int setHdmiSystemAudioSupported(boolean on, boolean force) {
		int device = AudioSystem.DEVICE_NONE;
		synchronized (mHdmiClientLock) {
		if (mHdmiManager != null) {
		@@ -13280,7 +13284,7 @@ public class AudioService extends IAudioService.Stub
		+ "system audio mode.");
		return device;
		}
		if (mHdmiSystemAudioSupported != on) {
		if (force \|\| mHdmiSystemAudioSupported != on) {
		mHdmiSystemAudioSupported = on;
		final int config = on ? AudioSystem.FORCE_HDMI_SYSTEM_AUDIO_ENFORCED :
		AudioSystem.FORCE_NONE;