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

Merge "AudioAttributes: fix regression with setLegacyStreamType in Builder" into qt-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2019-04-24 16:54:32 +00:00
committed by Android (Google) Code Review
parent d86369ae3e 9f70d4e29b
commit 22ad8a5eb9
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media/java/android/media/AudioAttributes.java
View File

@@ -786,8 +786,13 @@ public final class AudioAttributes implements Parcelable {
/**
* Sets attributes as inferred from the legacy stream types.
* Use this method when building an {@link AudioAttributes} instance to initialize some of
* the attributes by information derived from a legacy stream type.
* Warning: do not use this method in combination with setting any other attributes such as
* usage, content type, flags or haptic control, as this method will overwrite (the more
* accurate) information describing the use case previously set in the <code>Builder</code>.
* In general, avoid using it and prefer setting usage and content type directly
* with {@link #setUsage(int)} and {@link #setContentType(int)}.
* <p>Use this method when building an {@link AudioAttributes} instance to initialize some
* of the attributes by information derived from a legacy stream type.
* @param streamType one of {@link AudioManager#STREAM_VOICE_CALL},
* {@link AudioManager#STREAM_SYSTEM}, {@link AudioManager#STREAM_RING},
* {@link AudioManager#STREAM_MUSIC}, {@link AudioManager#STREAM_ALARM},
@@ -799,7 +804,8 @@ public final class AudioAttributes implements Parcelable {
throw new IllegalArgumentException("STREAM_ACCESSIBILITY is not a legacy stream "
+ "type that was used for audio playback");
}
return setInternalLegacyStreamType(streamType);
setInternalLegacyStreamType(streamType);
return this;
}
/**
@@ -815,7 +821,14 @@ public final class AudioAttributes implements Parcelable {
AudioProductStrategy.getAudioAttributesForStrategyWithLegacyStreamType(
streamType);
if (attributes != null) {
return new Builder(attributes).setHapticChannelsMuted(mMuteHapticChannels);
mUsage = attributes.mUsage;
mContentType = attributes.mContentType;
mFlags = attributes.mFlags;
mMuteHapticChannels = attributes.areHapticChannelsMuted();
mTags = attributes.mTags;
mBundle = attributes.mBundle;
mSource = attributes.mSource;
return this;
}
}
switch(streamType) {