Merge "BleAudioVolume: Fix calculation for the activated device" (b1066b67) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -377,7 +377,8 @@ public class AudioDeviceInventory {
		makeLeAudioDeviceUnavailable(address, btInfo.mAudioSystemDevice);
		} else if (switchToAvailable) {
		makeLeAudioDeviceAvailable(address, BtHelper.getName(btInfo.mDevice),
		streamType, btInfo.mVolume, btInfo.mAudioSystemDevice,
		streamType, btInfo.mVolume == -1 ? -1 : btInfo.mVolume * 10,
		btInfo.mAudioSystemDevice,
		"onSetBtActiveDevice");
		}
		break;

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -3841,7 +3841,7 @@ public class AudioService extends IAudioService.Stub
		}
		}

		private void setLeAudioVolumeOnModeUpdate(int mode) {
		private void setLeAudioVolumeOnModeUpdate(int mode, int streamType, int device) {
		switch (mode) {
		case AudioSystem.MODE_IN_COMMUNICATION:
		case AudioSystem.MODE_IN_CALL:
		@@ -3857,8 +3857,6 @@ public class AudioService extends IAudioService.Stub
		return;
		}

		int streamType = getBluetoothContextualVolumeStream(mode);

		// Currently, DEVICE_OUT_BLE_HEADSET is the only output type for LE_AUDIO profile.
		// (See AudioDeviceBroker#createBtDeviceInfo())
		int index = mStreamStates[streamType].getIndex(AudioSystem.DEVICE_OUT_BLE_HEADSET);
		@@ -3869,6 +3867,7 @@ public class AudioService extends IAudioService.Stub
		+ index + " maxIndex=" + maxIndex + " streamType=" + streamType);
		}
		mDeviceBroker.postSetLeAudioVolumeIndex(index, maxIndex, streamType);
		mDeviceBroker.postApplyVolumeOnDevice(streamType, device, "setLeAudioVolumeOnModeUpdate");
		}

		private void setStreamVolume(int streamType, int index, int flags, String callingPackage,
		@@ -5245,7 +5244,7 @@ public class AudioService extends IAudioService.Stub

		// Forcefully set LE audio volume as a workaround, since the value of 'device'
		// is not DEVICE_OUT_BLE_* even when BLE is connected.
		setLeAudioVolumeOnModeUpdate(mode);
		setLeAudioVolumeOnModeUpdate(mode, streamType, device);

		// when entering RINGTONE, IN_CALL or IN_COMMUNICATION mode, clear all SCO
		// connections not started by the application changing the mode when pid changes