summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-08-02 17:36:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-08-02 17:36:37 +0000
commit096fe3ea3379c0f2ee013257596d952ad668eca3 (patch)
tree0bffaad8bbf792db34429fe5850f2f5046f81fdc
parent40adbfbc57cff3260e74f884d151bd31d5828b54 (diff)
parenta9b4f094d420d96dcd31dc60f5f6f17583f287fa (diff)
Merge "Copy flags except MUTE_HAPTIC in setLegacyStreamType."
-rw-r--r--media/java/android/media/AudioAttributes.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java
index 820d82dd3bd1..65d3ffc78faf 100644
--- a/media/java/android/media/AudioAttributes.java
+++ b/media/java/android/media/AudioAttributes.java
@@ -824,7 +824,7 @@ public final class AudioAttributes implements Parcelable {
if (attributes != null) {
mUsage = attributes.mUsage;
mContentType = attributes.mContentType;
- mFlags = attributes.mFlags;
+ mFlags = attributes.getAllFlags();
mMuteHapticChannels = attributes.areHapticChannelsMuted();
mTags = attributes.mTags;
mBundle = attributes.mBundle;