commit a885760caacd710d9fd25315046fb22496fe43a4
author The Android Automerger <android-build@android.com> Tue Feb 21 15:26:18 2012 -0800
committer The Android Automerger <android-build@android.com> Tue Feb 21 15:26:18 2012 -0800
tree e03572e8b695ed447532b62ff7c4528b8c3579b8
parent ff6a97e1ce707dfdaed6e61339b3223b0d727ad6
parent 0f43ea45587885f4e9828b19ce9aa01848b24024

merge in ics-mr1-release history after reset to ics-mr1

apps/CtsVerifier/jni/audioquality/LinearityTest.cpp

diff --git a/apps/CtsVerifier/jni/audioquality/LinearityTest.cpp b/apps/CtsVerifier/jni/audioquality/LinearityTest.cpp
index f8cf9ac..2df7603 100644
--- a/apps/CtsVerifier/jni/audioquality/LinearityTest.cpp
+++ b/apps/CtsVerifier/jni/audioquality/LinearityTest.cpp
@@ -150,6 +150,8 @@
     for (int sig = 0; sig < numSignals; ++sig) {
         if (!peakLevels(pcms[sig], sampleCounts[sig],
              sampleRate, peakAverage + sig, peakRms + sig)) {
+            delete []peakAverage;
+            delete []peakRms;
             return -6; // failure because a signal is too short.
         }
     }
@@ -168,5 +170,7 @@
             maxDev = dev;
     }
     *maxDeviation = maxDev;
+    delete []peakAverage;
+    delete []peakRms;
     return 1;
 }