commit 1928cddbe98a24e173d1b83b870c67cd8f2deffb
author Phil Burk <philburk@google.com> Sat Jun 27 01:31:10 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 27 01:31:10 2020 +0000
tree e1fc16beeb305bff688a53317441b5b30699e6ee
parent 50b8acd4e1d5ce5e91ec2d3c31782e64db55d42d
parent 4c377ef1052cc45a44ed2b1ffdd11486a9b9d1e6

Merge changes I742a9d3d,Idce40ad2 into rvc-dev

* changes:
  aaudio: allow start when flushing
  aaudio test: flushing to start transition

media/codec2/components/aac/C2SoftAacDec.cpp

diff --git a/media/codec2/components/aac/C2SoftAacDec.cpp b/media/codec2/components/aac/C2SoftAacDec.cpp
index 9884733..677f316 100644
--- a/media/codec2/components/aac/C2SoftAacDec.cpp
+++ b/media/codec2/components/aac/C2SoftAacDec.cpp
@@ -791,7 +791,6 @@
 
                 // After an error, replace bufferSize with the sum of the
                 // decodedSizes to resynchronize the in/out lists.
-                inInfo.decodedSizes.pop_back();
                 inInfo.bufferSize = std::accumulate(
                         inInfo.decodedSizes.begin(), inInfo.decodedSizes.end(), 0);