commit be28c5ccb3bada7761707e2d2e363f2ce73a8bc0
author David Lin <dtwlin@google.com> Tue Apr 18 23:59:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 18 23:59:33 2017 +0000
tree 4c02b658f6424b70e8baaf3da8c691501d427bf9
parent cdf214fe201fcc4e1b15e980a3fed4b98609208d
parent c91c7c1f111c3899f896a413a4f8234db475b9f6

Merge "volume_listener: fix incorrect audio hal access" into oc-dev am: 3c67def445
am: c91c7c1f11

Change-Id: Icd64c4d587803e2488b14b91b2bd6a0ca1acceb7

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index db29122..08d5622 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)