commit 677cbb0b612c62075caf821e966b3a287cc3f770
author Mikhail Naganov <mnaganov@google.com> Fri Nov 15 15:34:54 2019 -0800
committer Mikhail Naganov <mnaganov@google.com> Thu Nov 21 10:59:31 2019 -0800
tree 0d2e12f643e9744b731d2455731cb15c6179928e
parent e3d058577e13f82710ea096a45da30af428524bb

Fix Pixel HAL for Audio VTS V6.0

Fix error codes returned by stream pause and resume
methods for the offload case.

Fix mmap buffer size check.

Bug: 144575694
Test: atest VtsHalAudioV6_0TargetTest
Change-Id: Iead2ed737a1994fd36f7b0f69ad107afcf14ddd6
Merged-In: Iead2ed737a1994fd36f7b0f69ad107afcf14ddd6

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 58d8f85..13be7aa 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -105,6 +105,7 @@
 #define MMAP_PERIOD_COUNT_MIN 32
 #define MMAP_PERIOD_COUNT_MAX 512
 #define MMAP_PERIOD_COUNT_DEFAULT (MMAP_PERIOD_COUNT_MAX)
+#define MMAP_MIN_SIZE_FRAMES_MAX 64 * 1024
 
 /* This constant enables extended precision handling.
  * TODO The flag is off until more testing is done.
@@ -3811,6 +3812,7 @@
     int status = -ENOSYS;
     ALOGV("%s", __func__);
     if (out->usecase == USECASE_AUDIO_PLAYBACK_OFFLOAD) {
+        status = -ENODATA;
         lock_output_stream(out);
         if (out->compr != NULL && out->offload_state == OFFLOAD_STATE_PLAYING) {
             status = compress_pause(out->compr);
@@ -3827,7 +3829,7 @@
     int status = -ENOSYS;
     ALOGV("%s", __func__);
     if (out->usecase == USECASE_AUDIO_PLAYBACK_OFFLOAD) {
-        status = 0;
+        status = -ENODATA;
         lock_output_stream(out);
         if (out->compr != NULL && out->offload_state == OFFLOAD_STATE_PAUSED) {
             status = compress_resume(out->compr);
@@ -3952,7 +3954,7 @@
     lock_output_stream(out);
     pthread_mutex_lock(&adev->lock);
 
-    if (info == NULL || min_size_frames == 0) {
+    if (info == NULL || min_size_frames <= 0 || min_size_frames > MMAP_MIN_SIZE_FRAMES_MAX) {
         ALOGE("%s: info = %p, min_size_frames = %d", __func__, info, min_size_frames);
         ret = -EINVAL;
         goto exit;
@@ -4690,7 +4692,7 @@
     pthread_mutex_lock(&adev->lock);
     ALOGV("%s in %p", __func__, in);
 
-    if (info == NULL || min_size_frames == 0) {
+    if (info == NULL || min_size_frames <= 0 || min_size_frames > MMAP_MIN_SIZE_FRAMES_MAX) {
         ALOGE("%s invalid argument info %p min_size_frames %d", __func__, info, min_size_frames);
         ret = -EINVAL;
         goto exit;