commit bfcfa00534254516a597ecb9d8b268f46f374ad2
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 08 05:28:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 08 05:28:27 2017 +0000
tree 4ceb37b8114f6be37be1dec4af4fb824ac92231e
parent eeb4d73d9f17873c73aa74dd7f0bab4b0fb45c07
parent 0b86e57b61b46652585008679e48b6961b40122d

Merge "audio: Fix read of uninitialized memory" into oc-dr1-dev

media/libaudioclient/AudioTrack.cpp

diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index 409c9a3..98ec7d7 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -1562,9 +1562,9 @@
     }
 
     mAudioTrack->attachAuxEffect(mAuxEffectId);
+    mFrameCount = frameCount;
     updateLatency_l();  // this refetches mAfLatency and sets mLatency
 
-    mFrameCount = frameCount;
     // If IAudioTrack is re-created, don't let the requested frameCount
     // decrease.  This can confuse clients that cache frameCount().
     if (frameCount > mReqFrameCount) {