diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-07-29 10:34:53 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2014-07-29 18:14:21 +0000 |
| commit | c1601f73b98b004b6210631830d2184255037948 (patch) | |
| tree | 38f441265aeb319bf531892b9f71901dbe815ce3 | |
| parent | c503896a4d0cab029bca56cf7ac18ae182729a0a (diff) | |
| download | frameworks_base-c1601f73b98b004b6210631830d2184255037948.zip frameworks_base-c1601f73b98b004b6210631830d2184255037948.tar.gz frameworks_base-c1601f73b98b004b6210631830d2184255037948.tar.bz2 | |
Restore missing usage assignment in AudioAttributes
A bad merge caused the usage field assignment in
setLegacyStreamType() to disappear. Restore it.
Change-Id: I2c72e09a2c4a394483b8a4521b72d5edcc346e23
| -rw-r--r-- | media/java/android/media/AudioAttributes.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index b2d8ffe..099cd3f 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -413,6 +413,7 @@ public final class AudioAttributes implements Parcelable { default: Log.e(TAG, "Invalid stream type " + streamType + " for AudioAttributes"); } + mUsage = usageForLegacyStreamType(streamType); return this; } |