From 90f52626bc2b33d3b92b627d98a7b4332d593af0 Mon Sep 17 00:00:00 2001 From: Phil Burk Date: Wed, 9 Aug 2017 12:01:21 -0700 Subject: [PATCH] aaudio: disable MMAP data path Some bugs were found late in the release cycle for DR1. It seems safer to simply disable MMAP mode for DR1 and enable it in MR1. Developers can still experiment with MMAP mode by overriding the policy using AAudio_setMmapPolicy(). Bug: 64316921 Bug: 64311216 Bug: 64494572 Test: "adb shell getprop aaudio.mmap_policy" should print 1 Change-Id: I94c1554ff7ea9062efbd3a80b40040fa7bd5268d --- device-common.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/device-common.mk b/device-common.mk index b9150a9..b37d4da 100644 --- a/device-common.mk +++ b/device-common.mk @@ -34,10 +34,14 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml # Enable AAudio MMAP/NOIRQ data path. -# 2 is AAUDIO_POLICY_AUTO so it will try MMAP then fallback to Legacy path. -PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2 -# Allow EXCLUSIVE then fall back to SHARED. -PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2 +# 1 is AAUDIO_POLICY_NEVER means only use Legacy path. +# 2 is AAUDIO_POLICY_AUTO means try MMAP then fallback to Legacy path. +# 3 is AAUDIO_POLICY_ALWAYS means only use MMAP path. +PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=1 +# 1 is AAUDIO_POLICY_NEVER means only use SHARED mode +# 2 is AAUDIO_POLICY_AUTO means try EXCLUSIVE then fallback to SHARED mode. +# 3 is AAUDIO_POLICY_ALWAYS means only use EXCLUSIVE mode. +PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=1 # Increase the apparent size of a hardware burst from 1 msec to 2 msec. # A "burst" is the number of frames processed at one time.