commit 9dcd34f438ed63b2806134368c68cd3004e4dffb
author Kevin Rocard <krocard@google.com> Wed Jun 13 16:19:36 2018 -0700
committer Kevin Rocard <krocard@google.com> Wed Jun 13 17:47:27 2018 -0700
tree 8df9451253ed236a33f3f805287cf3c0c7df2541
parent 5f2136e6323c1e241c918a59cd06e715480241cb

AAudio should not use legacy path if not allowed

Test: mmm frameworks/av/media/libaaudio/examples && adb sync data &&
      adb shell ! /data/nativetest64/write_sine_callback/write_sine_callback -m3
Change-Id: Ie17c4037c4b61caed07748a0ae79ec950da3c802
Signed-off-by: Kevin Rocard <krocard@google.com>

media/libaaudio/examples/utils/AAudioArgsParser.h

diff --git a/media/libaaudio/examples/utils/AAudioArgsParser.h b/media/libaaudio/examples/utils/AAudioArgsParser.h
index 88d7401..0e61589 100644
--- a/media/libaaudio/examples/utils/AAudioArgsParser.h
+++ b/media/libaaudio/examples/utils/AAudioArgsParser.h
@@ -272,7 +272,9 @@
                     if (strlen(arg) > 2) {
                         policy = atoi(&arg[2]);
                     }
-                    AAudio_setMMapPolicy(policy);
+                    if (!AAudio_setMMapPolicy(policy)) {
+                        printf("ERROR: invalid MMAP policy mode %i\n", policy);
+                    }
                 } break;
                 case 'n':
                     setNumberOfBursts(atoi(&arg[2]));
@@ -363,7 +365,7 @@
                 mode = AAUDIO_PERFORMANCE_MODE_POWER_SAVING;
                 break;
             default:
-                printf("ERROR invalid performance mode %c\n", c);
+                printf("ERROR: invalid performance mode %c\n", c);
                 break;
         }
         return mode;

media/libaaudio/src/core/AudioStreamBuilder.cpp

diff --git a/media/libaaudio/src/core/AudioStreamBuilder.cpp b/media/libaaudio/src/core/AudioStreamBuilder.cpp
index 3a7a578..4ef765d 100644
--- a/media/libaaudio/src/core/AudioStreamBuilder.cpp
+++ b/media/libaaudio/src/core/AudioStreamBuilder.cpp
@@ -150,6 +150,11 @@
         allowMMap = false;
     }
 
+    if (!allowMMap && !allowLegacy) {
+        ALOGE("%s() no backend available: neither MMAP nor legacy path are allowed", __func__);
+        return AAUDIO_ERROR_ILLEGAL_ARGUMENT;
+    }
+
     result = builder_createStream(getDirection(), sharingMode, allowMMap, &audioStream);
     if (result == AAUDIO_OK) {
         // Open the stream using the parameters from the builder.