Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioService: setDeviceVolume no-op when for current device" into udc-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2023-04-19 15:41:24 +00:00
committed by Android (Google) Code Review
parent b01e5d12b9 169ee39834
commit 645d08997f
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -3989,8 +3989,15 @@ public class AudioService extends IAudioService.Stub
// VOLUME_CHANGED_ACTION intent to see if the current device is the one being modified
final int currDev = getDeviceForStream(vi.getStreamType());
final boolean skipping = (currDev == ada.getInternalType());
AudioService.sVolumeLogger.enqueue(new DeviceVolumeEvent(vi.getStreamType(), index, ada,
currDev, callingPackage));
currDev, callingPackage, skipping));
if (skipping) {
// setDeviceVolume was called on a device currently being used
return;
}
// TODO handle unmuting of current audio device
// if a stream is not muted but the VolumeInfo is for muting, set the volume index

16
services/core/java/com/android/server/audio/AudioServiceEvents.java
View File

@@ -175,15 +175,17 @@ public class AudioServiceEvents {
final String mDeviceAddress;
final String mCaller;
final int mDeviceForStream;
final boolean mSkipped;
DeviceVolumeEvent(int streamType, int index, @NonNull AudioDeviceAttributes device,
int deviceForStream, String callingPackage) {
int deviceForStream, String callingPackage, boolean skipped) {
mStream = streamType;
mVolIndex = index;
mDeviceNativeType = "0x" + Integer.toHexString(device.getInternalType());
mDeviceAddress = device.getAddress();
mDeviceForStream = deviceForStream;
mCaller = callingPackage;
mSkipped = skipped;
// log metrics
new MediaMetrics.Item(MediaMetrics.Name.AUDIO_VOLUME_EVENT)
.set(MediaMetrics.Property.EVENT, "setDeviceVolume")
@@ -198,14 +200,18 @@ public class AudioServiceEvents {
@Override
public String eventToString() {
return new StringBuilder("setDeviceVolume(stream:")
final StringBuilder sb = new StringBuilder("setDeviceVolume(stream:")
.append(AudioSystem.streamToString(mStream))
.append(" index:").append(mVolIndex)
.append(" device:").append(mDeviceNativeType)
.append(" addr:").append(mDeviceAddress)
.append(") from ").append(mCaller)
.append(" currDevForStream:Ox").append(Integer.toHexString(mDeviceForStream))
.toString();
.append(") from ").append(mCaller);
if (mSkipped) {
sb.append(" skipped [device in use]");
} else {
sb.append(" currDevForStream:Ox").append(Integer.toHexString(mDeviceForStream));
}
return sb.toString();
}
}