commit b6d76635160f3102b7c23eea5b81b3b15b126690
author Kevin Rocard <krocard@google.com> Wed Apr 19 01:11:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 19 01:11:28 2017 +0000
tree 65390dcd0f051943094a05bbb6973271957a92a4
parent be28c5ccb3bada7761707e2d2e363f2ce73a8bc0
parent ed985937f737bde6b40bd63f193bd7822eeb1d97

Merge "Prevent leak of sndmonitor resources" into oc-dev am: e46a28d3c7
am: ed985937f7

Change-Id: I9087eb73ab92e234b73ee634bc4cf1cf04874aac

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 76343f7..1f762e9 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3821,6 +3821,7 @@
 
         in->usecase = USECASE_AUDIO_RECORD_AFE_PROXY;
         in->config = pcm_config_afe_proxy_record;
+        in->af_period_multiplier = 1;
     } else {
         in->usecase = USECASE_AUDIO_RECORD;
         if (config->sample_rate == LOW_LATENCY_CAPTURE_SAMPLE_RATE &&

post_proc/Android.mk

diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index eb59ddb..493f2cc 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8909,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8909 msm8998,$(TARGET_BOARD_PLATFORM)),)
 
 LOCAL_PATH:= $(call my-dir)
 
@@ -35,7 +35,7 @@
 
 ################################################################################
 
-ifneq ($(filter msm8992 msm8994 msm8996 msm8909,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8992 msm8994 msm8996 msm8909 msm8998,$(TARGET_BOARD_PLATFORM)),)
 
 include $(CLEAR_VARS)