summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/Threads.cpp
diff options
context:
space:
mode:
authorjiabin <jiabin@google.com>2019-04-10 16:38:07 -0700
committerjiabin <jiabin@google.com>2019-04-10 16:38:07 -0700
commit84114c3fc63f1b3a7535d1b9df171c40d7969be2 (patch)
treef0fce03d0c39ccdaea71805ef175bcb3340a2c12 /services/audioflinger/Threads.cpp
parentd21b6de7181840e14300e94284db48172e24004b (diff)
downloadframeworks_av-84114c3fc63f1b3a7535d1b9df171c40d7969be2.tar.gz
frameworks_av-84114c3fc63f1b3a7535d1b9df171c40d7969be2.tar.bz2
frameworks_av-84114c3fc63f1b3a7535d1b9df171c40d7969be2.zip
Init haptic intensity for the first fast track.
The haptic intensity for fast track should be initialized, or it will be HAPTIC_SCALE_MUTE by default, which may result in no haptics. Bug: 130312331 Test: play haptics stream with FastMixer enabled Change-Id: If5a1ea12c563c4af1422b2e32451b80e69d2ef58
Diffstat (limited to 'services/audioflinger/Threads.cpp')
-rw-r--r--services/audioflinger/Threads.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 0bb2213798..6e2497f8bc 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -4191,6 +4191,7 @@ AudioFlinger::MixerThread::MixerThread(const sp<AudioFlinger>& audioFlinger, Aud
// audio to FastMixer
fastTrack->mFormat = mFormat; // mPipeSink format for audio to FastMixer
fastTrack->mHapticPlaybackEnabled = mHapticChannelMask != AUDIO_CHANNEL_NONE;
+ fastTrack->mHapticIntensity = AudioMixer::HAPTIC_SCALE_NONE;
fastTrack->mGeneration++;
state->mFastTracksGen++;
state->mTrackMask = 1;