commit 0b86e57b61b46652585008679e48b6961b40122d
author Andreas Gampe <agampe@google.com> Wed Jun 07 18:56:27 2017 -0700
committer Andreas Gampe <agampe@google.com> Thu Jun 08 02:02:39 2017 +0000
tree 1bea7921ede728cd7589235175d0d1a8a3b78de6
parent c1c9b13223230f8d0e8bddd41e63c7046b7a98a5

audio: Fix read of uninitialized memory

Follow-up to fb12e20e426bc6bcff06e39fba45a931cf787040.

Bug: 62425341
Test: m
Test: Device boots, com.android.phone doesn't crash
Change-Id: Ib54c7efae88cb0bff0f92e1cf1bd20a22fdcbdba

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) {