Merge "Initialize absolute volume state onReinitVolume" into main (ad497393) · Commits · e / os / android_frameworks_base

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

+16 −16

Original line number	Diff line number	Diff line
		@@ -2070,22 +2070,6 @@ public class AudioService extends IAudioService.Stub

		onIndicateSystemReady();

		synchronized (mCachedAbsVolDrivingStreamsLock) {
		mCachedAbsVolDrivingStreams.forEach((dev, stream) -> {
		boolean enabled = true;
		if (dev == AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP) {
		enabled = mAvrcpAbsVolSupported;
		}
		final int result = mAudioSystem.setDeviceAbsoluteVolumeEnabled(dev, /address=/"",
		enabled, stream);
		if (result != AudioSystem.AUDIO_STATUS_OK) {
		sVolumeLogger.enqueueAndSlog(
		new VolumeEvent(VolumeEvent.VOL_ABS_DEVICE_ENABLED_ERROR,
		result, dev, enabled, stream).eventToString(), ALOGE, TAG);
		}
		});
		}

		// indicate the end of reconfiguration phase to audio HAL
		AudioSystem.setParameters("restarting=false");

		@@ -2200,6 +2184,22 @@ public class AudioService extends IAudioService.Stub
		return;
		}

		synchronized (mCachedAbsVolDrivingStreamsLock) {
		mCachedAbsVolDrivingStreams.forEach((dev, stream) -> {
		boolean enabled = true;
		if (dev == AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP) {
		enabled = mAvrcpAbsVolSupported;
		}
		final int result = mAudioSystem.setDeviceAbsoluteVolumeEnabled(dev, /address=/"",
		enabled, stream);
		if (result != AudioSystem.AUDIO_STATUS_OK) {
		sVolumeLogger.enqueueAndSlog(
		new VolumeEvent(VolumeEvent.VOL_ABS_DEVICE_ENABLED_ERROR,
		result, dev, enabled, stream).eventToString(), ALOGE, TAG);
		}
		});
		}

		// did it work? check based on min/max values of some basic streams
		if (!checkVolumeRangeInitialization(caller)) {
		return;