diff options
| author | jiabin <jiabin@google.com> | 2019-04-17 14:48:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-17 14:48:43 -0700 |
| commit | 910575313482d9530e6fd1a3716e40cb4f87f0fb (patch) | |
| tree | 81721ee16dc2f23e21deeaa476ea79be27055d89 | |
| parent | 75204654512e70b4bbf31ae2841a32971bc7cd4e (diff) | |
| parent | f02aabe529cec8ce9be3d1d15d5c14fa968a2ca7 (diff) | |
Merge "Treat FLAG_MUTE_HAPTIC separately from mFlags." into qt-dev
am: f02aabe529
Change-Id: Ie96f3971374681e3596494a05c1db6c9fd657a58
| -rw-r--r-- | media/java/android/media/AudioAttributes.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index e655460c2ba1..a9150d4b7455 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -388,10 +388,12 @@ public final class AudioAttributes implements Parcelable { */ public static final int FLAG_NO_SYSTEM_CAPTURE = 0x1 << 12; + // Note that even though FLAG_MUTE_HAPTIC is stored as a flag bit, it is not here since + // it is known as a boolean value outside of AudioAttributes. private static final int FLAG_ALL = FLAG_AUDIBILITY_ENFORCED | FLAG_SECURE | FLAG_SCO | FLAG_BEACON | FLAG_HW_AV_SYNC | FLAG_HW_HOTWORD | FLAG_BYPASS_INTERRUPTION_POLICY | FLAG_BYPASS_MUTE | FLAG_LOW_LATENCY | FLAG_DEEP_BUFFER | FLAG_NO_MEDIA_PROJECTION - | FLAG_MUTE_HAPTIC | FLAG_NO_SYSTEM_CAPTURE; + | FLAG_NO_SYSTEM_CAPTURE; private final static int FLAG_ALL_PUBLIC = FLAG_AUDIBILITY_ENFORCED | FLAG_HW_AV_SYNC | FLAG_LOW_LATENCY; @@ -598,8 +600,9 @@ public final class AudioAttributes implements Parcelable { public Builder(AudioAttributes aa) { mUsage = aa.mUsage; mContentType = aa.mContentType; - mFlags = aa.mFlags; + mFlags = aa.getAllFlags(); mTags = (HashSet<String>) aa.mTags.clone(); + mMuteHapticChannels = aa.areHapticChannelsMuted(); } /** @@ -812,7 +815,7 @@ public final class AudioAttributes implements Parcelable { AudioProductStrategy.getAudioAttributesForStrategyWithLegacyStreamType( streamType); if (attributes != null) { - return new Builder(attributes); + return new Builder(attributes).setHapticChannelsMuted(mMuteHapticChannels); } } switch(streamType) { |