diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-05-21 16:16:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-21 16:16:19 +0000 |
| commit | e6b874b1aa4410235d9f839d35b57e3a1826410c (patch) | |
| tree | d71d170aa14b8d675ca0b82e577911bcd4f75d9b /media | |
| parent | e695b59eb586eeda064b715b5e35f4e491039e33 (diff) | |
| parent | d3969546a8bc4efe1e5e8a72bee07105055d18c2 (diff) | |
| download | frameworks_base-e6b874b1aa4410235d9f839d35b57e3a1826410c.zip frameworks_base-e6b874b1aa4410235d9f839d35b57e3a1826410c.tar.gz frameworks_base-e6b874b1aa4410235d9f839d35b57e3a1826410c.tar.bz2 | |
Merge "Fix reading attributes for playback restrictions" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioTrack.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/SoundPool.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index bd7a247..f76189c 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -1519,7 +1519,7 @@ public class AudioTrack } private boolean isRestricted() { - if ((mAttributes.getFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) { + if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) { return false; } try { diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index f148606..2e92c40 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -1757,7 +1757,7 @@ public class MediaPlayer implements SubtitleController.Listener throw new IllegalArgumentException(msg); } mUsage = attributes.getUsage(); - mBypassInterruptionPolicy = (attributes.getFlags() + mBypassInterruptionPolicy = (attributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0; Parcel pattributes = Parcel.obtain(); attributes.writeToParcel(pattributes, AudioAttributes.FLATTEN_TAGS); diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java index 88d979e..64863c2 100644 --- a/media/java/android/media/SoundPool.java +++ b/media/java/android/media/SoundPool.java @@ -463,7 +463,7 @@ public class SoundPool { } private boolean isRestricted() { - if ((mAttributes.getFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) { + if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) { return false; } try { |