From: Eric Laurent <elaurent@google.com>
Date: Sat, 17 Mar 2012 00:22:34 +0000 (-0700)
Subject: resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp
X-Git-Tag: android-x86-4.4-r1~1579^2~24^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e341547e2931b4aae4681053491ba5ccbab06e6f;p=android-x86%2Fframeworks-av.git

resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp

Change-Id: Ib6af53957780a09e59d663206b956a39fe883d6a
---

e341547e2931b4aae4681053491ba5ccbab06e6f
diff --cc media/libmedia/AudioTrack.cpp
index d51cd69191,498ad454bb..3a8bfa3762
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@@ -763,12 -763,9 +763,9 @@@ status_t AudioTrack::createTrack_l
                  mNotificationFramesAct = frameCount/2;
              }
              if (frameCount < minFrameCount) {
-                 if (enforceFrameCount) {
-                     ALOGE("Invalid buffer size: minFrameCount %d, frameCount %d", minFrameCount, frameCount);
-                     return BAD_VALUE;
-                 } else {
-                     frameCount = minFrameCount;
-                 }
 -                LOGW_IF(enforceFrameCount, "Minimum buffer size corrected from %d to %d",
++                ALOGW_IF(enforceFrameCount, "Minimum buffer size corrected from %d to %d",
+                          frameCount, minFrameCount);
+                 frameCount = minFrameCount;
              }
          } else {
              // Ensure that buffer alignment matches channelcount