diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-02-03 23:02:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-03 23:02:20 +0000 |
| commit | a1852f6ec8d50ae137492e91d50defd63e91ca48 (patch) | |
| tree | 9a659fcefdb663fe447f70ec9047db2e7f84866b /media | |
| parent | 08c010421a662341cad60f3c381d8f3a82edd4f6 (diff) | |
| parent | 3d22bf04e399123e07ae9c2075784b63c8678d04 (diff) | |
| download | frameworks_base-a1852f6ec8d50ae137492e91d50defd63e91ca48.zip frameworks_base-a1852f6ec8d50ae137492e91d50defd63e91ca48.tar.gz frameworks_base-a1852f6ec8d50ae137492e91d50defd63e91ca48.tar.bz2 | |
Merge "AudioAttributes javadoc update for conversion to stream types"
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioAttributes.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 489f552..ca242e4 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -709,7 +709,13 @@ public final class AudioAttributes implements Parcelable { } } - /** @hide */ + /** + * @hide + * Only use to get which stream type should be used for volume control, NOT for audio playback + * (all audio playback APIs are supposed to take AudioAttributes as input parameters) + * @param aa non-null AudioAttributes. + * @return a valid stream type for volume control that matches the attributes. + */ public static int toLegacyStreamType(AudioAttributes aa) { // flags to stream type mapping if ((aa.getFlags() & FLAG_AUDIBILITY_ENFORCED) == FLAG_AUDIBILITY_ENFORCED) { |