Merge "aaudio: add glitch detection to loopback, improve latency check" into oc-dr1-dev

am: d478859f02

Change-Id: Ic2e44eebd2ef8110321799b01597714b0c0a12e8

diff --cc media/libaaudio/examples/utils/AAudioSimpleRecorder.h
index 6be9112,5ecac04..1344273
--- 1/media/libaaudio/examples/utils/AAudioSimpleRecorder.h
--- 2/media/libaaudio/examples/utils/AAudioSimpleRecorder.h
+++ b/media/libaaudio/examples/utils/AAudioSimpleRecorder.h
@@@ -77,8 -77,16 +77,16 @@@ public
          if (mStream == nullptr) {
              return AAUDIO_ERROR_INVALID_STATE;
          }
 -        return AAudioStream_getChannelCount(mStream);
 +        return AAudioStream_getChannelCount(mStream);;
      }
+ 
+     /**
+      * @deprecated use getChannelCount()
+      */
+     int32_t getSamplesPerFrame() {
+         return getChannelCount();
+     }
+ 
      /**
       * Only call this after open() has been called.
       */