Merge "Improve dumpsys logging of volume change events" into main (f81f634a) · Commits · e / os / android_frameworks_base

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

+17 −5

Original line number	Diff line number	Diff line
		@@ -8868,6 +8868,7 @@ public class AudioService extends IAudioService.Stub
		boolean changed;
		int oldIndex;
		final boolean isCurrentDevice;
		final StringBuilder aliasStreamIndexes = new StringBuilder();
		synchronized (mSettingsLock) {
		synchronized (VolumeStreamState.class) {
		oldIndex = getIndex(device);
		@@ -8894,13 +8895,17 @@ public class AudioService extends IAudioService.Stub
		(changed \|\| !aliasStreamState.hasIndexForDevice(device))) {
		final int scaledIndex =
		rescaleIndex(aliasIndex, mStreamType, streamType);
		aliasStreamState.setIndex(scaledIndex, device, caller,
		hasModifyAudioSettings);
		boolean changedAlias = aliasStreamState.setIndex(scaledIndex, device,
		caller, hasModifyAudioSettings);
		if (isCurrentDevice) {
		aliasStreamState.setIndex(scaledIndex,
		changedAlias \|= aliasStreamState.setIndex(scaledIndex,
		getDeviceForStream(streamType), caller,
		hasModifyAudioSettings);
		}
		if (changedAlias) {
		aliasStreamIndexes.append(AudioSystem.streamToString(streamType))
		.append(":").append((scaledIndex + 5) / 10).append(" ");
		}
		}
		}
		// Mirror changes in SPEAKER ringtone volume on SCO when
		@@ -8940,8 +8945,15 @@ public class AudioService extends IAudioService.Stub
		oldIndex);
		mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS,
		mStreamVolumeAlias[mStreamType]);
		if (mStreamType == mStreamVolumeAlias[mStreamType]) {
		String aliasStreamIndexesString = "";
		if (!aliasStreamIndexes.isEmpty()) {
		aliasStreamIndexesString =
		" aliased streams: " + aliasStreamIndexes;
		}
		AudioService.sVolumeLogger.enqueue(new VolChangedBroadcastEvent(
		mStreamType, mStreamVolumeAlias[mStreamType], index, oldIndex));
		mStreamType, aliasStreamIndexesString, index, oldIndex));
		}
		sendBroadcastToAll(mVolumeChanged, mVolumeChangedOptions);
		}
		}

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -151,13 +151,13 @@ public class AudioServiceEvents {

		static final class VolChangedBroadcastEvent extends EventLogger.Event {
		final int mStreamType;
		final int mAliasStreamType;
		final String mAliasStreamIndexes;
		final int mIndex;
		final int mOldIndex;

		VolChangedBroadcastEvent(int stream, int alias, int index, int oldIndex) {
		VolChangedBroadcastEvent(int stream, String aliasIndexes, int index, int oldIndex) {
		mStreamType = stream;
		mAliasStreamType = alias;
		mAliasStreamIndexes = aliasIndexes;
		mIndex = index;
		mOldIndex = oldIndex;
		}
		@@ -167,8 +167,8 @@ public class AudioServiceEvents {
		return new StringBuilder("sending VOLUME_CHANGED stream:")
		.append(AudioSystem.streamToString(mStreamType))
		.append(" index:").append(mIndex)
		.append(" (was:").append(mOldIndex)
		.append(") alias:").append(AudioSystem.streamToString(mAliasStreamType))
		.append(" (was:").append(mOldIndex).append(")")
		.append(mAliasStreamIndexes)
		.toString();
		}
		}