Merge "Remove valid mask of microphone characteristics."
diff --git a/AndroidBoard.mk b/AndroidBoard.mk
new file mode 100644
index 0000000..006fe5c
--- /dev/null
+++ b/AndroidBoard.mk
@@ -0,0 +1,17 @@
+#
+# Copyright 2018 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+-include vendor/google_devices/taimen/proprietary/AndroidBoardVendor.mk
diff --git a/aosp_taimen.mk b/aosp_taimen.mk
index 5f2c414..5653fd5 100644
--- a/aosp_taimen.mk
+++ b/aosp_taimen.mk
@@ -24,7 +24,7 @@
PRODUCT_PACKAGES += \
Dialer \
- Launcher3 \
+ Launcher3QuickStep \
WallpaperPicker \
netutils-wrapper-1.0 \
vndk_package
diff --git a/init-taimen.rc b/init-taimen.rc
index 3fd4914..14c5fc0 100644
--- a/init-taimen.rc
+++ b/init-taimen.rc
@@ -23,8 +23,6 @@
write /sys/block/sde/queue/iostats 1
write /sys/block/dm-0/queue/read_ahead_kb 512
write /sys/block/dm-1/queue/read_ahead_kb 512
- write /sys/block/sda/queue/scheduler deadline
- write /sys/block/sde/queue/scheduler deadline
on boot
# Allow ftm4 autotune from adb shell
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index 46c5a68..1151590 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -886,6 +886,10 @@
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia2" value="1" />
</path>
+ <path name="hifi-playback handset-hac">
+ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="1" />
+ </path>
+
<path name="hifi-playback display-port">
<ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
</path>
@@ -940,6 +944,10 @@
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback handset-hac">
+ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="1" />
+ </path>
+
<path name="compress-offload-playback display-port">
<ctl name="DISPLAY_PORT Mixer MultiMedia4" value="1" />
</path>
@@ -1006,17 +1014,21 @@
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia3" value="1" />
</path>
+ <path name="mmap-playback handset-hac">
+ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="1" />
+ </path>
+
<path name="mmap-playback speaker-and-headphones">
<path name="mmap-playback speaker" />
<path name="mmap-playback" />
</path>
<path name="mmap-playback bt-sco">
- <ctl name="AUX_PCM_RX Audio Mixer MultiMedia3" value="1" />
+ <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia3" value="1" />
</path>
<path name="mmap-playback bt-sco-wb">
- <ctl name="AUX PCM SampleRate" value="16000" />
+ <ctl name="BT SampleRate" value="KHZ_16" />
<path name="mmap-playback bt-sco" />
</path>
@@ -1861,6 +1873,12 @@
<path name="handset-mic" />
</path>
+ <path name="bt-sco-headset">
+ </path>
+
+ <path name="bt-sco-headset-wb">
+ </path>
+
<path name="speaker-and-bt-sco">
<path name="speaker"/>
<path name="bt-sco-headset"/>
@@ -1881,15 +1899,9 @@
<path name="bt-sco-headset-wb"/>
</path>
- <path name="bt-sco-headset">
- </path>
-
<path name="bt-sco-mic">
</path>
- <path name="bt-sco-headset-wb">
- </path>
-
<path name="bt-sco-mic-wb">
</path>
@@ -2118,6 +2130,10 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="audio-playback-voip handset-hac">
+ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
+ </path>
+
<!-- VoIP Tx settings -->
<path name="audio-record-voip">
<ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />
