commit ca249e444bd59c5b2c3a094108f6c489f8ce80e1
author Dan Willemsen <dwillemsen@google.com> Tue Oct 27 23:27:46 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 27 23:27:46 2015 +0000
tree 1fd03f46c5c1ada6678ea667f1d6537e01f4a68c
parent 106fb85b42000d085329fbd6bb6cc1d2ac47317d
parent a73b059815fc35ba689e5a8235b567b2353eabad

Merge "Remove __DATE__/__TIME__"
am: a73b059815

* commit 'a73b059815fc35ba689e5a8235b567b2353eabad':
  Remove __DATE__/__TIME__

libPCMutils/src/pcmutils_lib.cpp

diff --git a/libPCMutils/src/pcmutils_lib.cpp b/libPCMutils/src/pcmutils_lib.cpp
index 3bb1cee..e6ac3ff 100644
--- a/libPCMutils/src/pcmutils_lib.cpp
+++ b/libPCMutils/src/pcmutils_lib.cpp
@@ -88,7 +88,7 @@
                 expansion in the PCM time domain.
 
 *******************************************************************************/
-
+#include <log/log.h>
 #include "pcmutils_lib.h"
 
 #include "genericStds.h"
@@ -2078,7 +2078,10 @@
           map[ch++]  = inCh;
         }
       }
-      FDK_ASSERT(ch == numInChannels);
+      if (ch != numInChannels) {
+          ALOGE("b/23876444");
+          return PCMDMX_INVALID_ARGUMENT;
+      }
 
       /* Remove unused cols from factor matrix */
       for (inCh=0; inCh < numInChannels; inCh+=1) {