Snap for 4448085 from fe102714c52ca6a60abe25b7be12d8db0232c1eb to oc-m3-release
Change-Id: Ie68136f5e026060f8b99b87e9b16a4f8fd71274a
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0b9f743..c6c51f0 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -27,14 +27,7 @@
# sepolicy
BOARD_SEPOLICY_DIRS += device/google/taimen/sepolicy
-ifeq (,$(filter-out taimen_clang, $(TARGET_PRODUCT)))
-# if TARGET_PRODUCT == taimen_clang
-BOARD_VENDOR_KERNEL_MODULES += \
- device/google/wahoo-kernel/clang/touch_core_base.ko \
- device/google/wahoo-kernel/clang/ftm4.ko \
- device/google/wahoo-kernel/clang/sw49408.ko \
- device/google/wahoo-kernel/clang/lge_battery.ko
-else ifeq (,$(filter-out taimen_gcc, $(TARGET_PRODUCT)))
+ifeq (,$(filter-out taimen_gcc, $(TARGET_PRODUCT)))
# if TARGET_PRODUCT == taimen_gcc
BOARD_VENDOR_KERNEL_MODULES += \
device/google/wahoo-kernel/gcc/touch_core_base.ko \
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index eb53cb9..18219bc 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -61,7 +61,8 @@
# Enable Rx handling options
# Rx_thread=1 RPS=2(default for ROME) NAPI=4(default for ihelium)
-rx_mode=4
+# Rx_thread + NAPI = 5
+rx_mode=5
#Enable VHT on 2.4Ghz
gEnableVhtFor24GHzBand=1
@@ -235,6 +236,10 @@
# 1 - enable 0 - disable(default)
gEnableFlowSteering=1
+ce_service_max_yield_time=500
+ce_service_max_rx_ind_flush=1
+maxMSDUsPerRxInd=8
+
################ Datapath feature set End ################
#############################################
diff --git a/audio_platform_info_tavil.xml b/audio_platform_info_tavil.xml
index ae5bc9b..69ae11a 100644
--- a/audio_platform_info_tavil.xml
+++ b/audio_platform_info_tavil.xml
@@ -39,6 +39,10 @@
<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" acdb_id="126"/>
<device name="SND_DEVICE_IN_BT_SCO_MIC_NREC" acdb_id="122"/>
<device name="SND_DEVICE_IN_BT_SCO_MIC_WB_NREC" acdb_id="123"/>
+ <device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="143"/>
+ <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" acdb_id="144"/>
+ <device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>
+ <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" acdb_id="146"/>
</acdb_ids>
<bit_width_configs>
<device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>
@@ -55,6 +59,7 @@
<usecase name="USECASE_VOICEMMODE2_CALL" type="in" id="19" />
<usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="19" />
<usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="4" />
+ <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="7" />
<usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="4" />
<usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />
<usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />
diff --git a/device.mk b/device.mk
index f8b8505..782071f 100644
--- a/device.mk
+++ b/device.mk
@@ -44,7 +44,8 @@
# Kernel Modules Config
PRODUCT_COPY_FILES += \
- device/google/taimen/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg
+ device/google/taimen/init.insmod.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg \
+ device/google/taimen/init.insmod_charger.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod_charger.cfg
# Logging
PRODUCT_COPY_FILES += \
diff --git a/init-taimen.rc b/init-taimen.rc
index 0ea849f..127abf6 100644
--- a/init-taimen.rc
+++ b/init-taimen.rc
@@ -28,10 +28,6 @@
# Allow ftm4 autotune from adb shell
chown system shell /sys/devices/virtual/input/ftm4_touch/autotune
-on init && property:ro.boot.slot=*
- # will remove this once slot_suffix is deprecated
- setprop ro.boot.slot_suffix _${ro.boot.slot}
-
on init && property:ro.boot.revision=*
setprop ro.boot.hardware.revision ${ro.boot.revision}
diff --git a/init.insmod_charger.cfg b/init.insmod_charger.cfg
new file mode 100644
index 0000000..c54070a
--- /dev/null
+++ b/init.insmod_charger.cfg
@@ -0,0 +1 @@
+insmod /vendor/lib/modules/lge_battery.ko
diff --git a/mixer_paths_tavil.xml b/mixer_paths_tavil.xml
index d1c6c69..5ba1e00 100644
--- a/mixer_paths_tavil.xml
+++ b/mixer_paths_tavil.xml
@@ -1560,10 +1560,11 @@
<ctl name="DEC7 Volume" value="86" />
</path>
- <!-- CAMCORDER MIC 2nd D:4 dB -->
+ <!-- CAMCORDER MIC 2nd D:0 dB -->
<path name="camcorder-mic">
- <path name="dmic1" />
- <ctl name="DEC7 Volume" value="88" />
+ <path name="dmic5" />
+ <ctl name="DEC6 Volume" value="84" />
+ <ctl name="SLIM_0_TX Format" value="S24_LE" />
</path>
<!-- TX Dual-mic 1st MIC D:4 dB, 2nd MIC:4 dB -->
diff --git a/overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png b/overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png
index 45fffcc..2e6abc6 100644
--- a/overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png
+++ b/overlay/packages/apps/Settings/res/drawable-xxxhdpi/regulatory_info.png
Binary files differ
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index bfe61ff..f97a318 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -21,8 +21,6 @@
system/framework/embmslibrary.jar \
system/framework/rcsimssettings.jar \
system/framework/vendor.qti.qcril.am-V1.0-java.jar \
- system/lib64/android.hardware.biometrics.fingerprint@2.1.so \
- system/lib64/android.hardware.oemlock@1.0.so \
system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so \
system/lib64/libaptX_encoder.so \
system/lib64/libaptXHD_encoder.so \
@@ -33,7 +31,6 @@
system/lib64/lib-imsvtextutils.so \
system/lib64/lib-imsvt.so \
system/lib64/lib-imsvtutils.so \
- system/lib64/libion.so \
system/lib64/libiperf.so \
system/lib64/librcc.so \
system/lib/com.qualcomm.qti.imsrtpservice@1.0.so \
@@ -44,7 +41,6 @@
system/lib/lib-imsvtextutils.so \
system/lib/lib-imsvt.so \
system/lib/lib-imsvtutils.so \
- system/lib/libion.so \
system/lib/libiperf.so \
system/lib/librcc.so \
system/xbin/iperf3 \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index ae2684f..612eda7 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -30,8 +30,6 @@
vendor/qcom/taimen/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \
vendor/qcom/taimen/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \
vendor/qcom/taimen/proprietary/vendor.qti.qcril.am-V1.0-java.jar:system/framework/vendor.qti.qcril.am-V1.0-java.jar:qcom \
- vendor/qcom/taimen/proprietary/lib64/android.hardware.biometrics.fingerprint@2.1.so:system/lib64/android.hardware.biometrics.fingerprint@2.1.so:qcom \
- vendor/qcom/taimen/proprietary/lib64/android.hardware.oemlock@1.0.so:system/lib64/android.hardware.oemlock@1.0.so:qcom \
vendor/qcom/taimen/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \
vendor/qcom/taimen/proprietary/lib64/libaptX_encoder.so:system/lib64/libaptX_encoder.so:qcom \
vendor/qcom/taimen/proprietary/lib64/libaptXHD_encoder.so:system/lib64/libaptXHD_encoder.so:qcom \
@@ -42,7 +40,6 @@
vendor/qcom/taimen/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so:qcom \
vendor/qcom/taimen/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so:qcom \
vendor/qcom/taimen/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \
- vendor/qcom/taimen/proprietary/lib64/libion.so:system/lib64/libion.so:qcom \
vendor/qcom/taimen/proprietary/lib64/libiperf.so:system/lib64/libiperf.so:qcom \
vendor/qcom/taimen/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \
vendor/qcom/taimen/proprietary/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \
@@ -53,7 +50,6 @@
vendor/qcom/taimen/proprietary/lib-imsvtextutils.so:system/lib/lib-imsvtextutils.so:qcom \
vendor/qcom/taimen/proprietary/lib-imsvt.so:system/lib/lib-imsvt.so:qcom \
vendor/qcom/taimen/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \
- vendor/qcom/taimen/proprietary/libion.so:system/lib/libion.so:qcom \
vendor/qcom/taimen/proprietary/libiperf.so:system/lib/libiperf.so:qcom \
vendor/qcom/taimen/proprietary/librcc.so:system/lib/librcc.so:qcom \
vendor/qcom/taimen/proprietary/iperf3:system/xbin/iperf3:qcom \
diff --git a/sepolicy/hal_camera_default.te b/sepolicy/hal_camera_default.te
new file mode 100644
index 0000000..9d32c0a
--- /dev/null
+++ b/sepolicy/hal_camera_default.te
@@ -0,0 +1,2 @@
+allow hal_camera_default persist_file:dir search;
+allow hal_camera_default persist_file:file r_file_perms;
diff --git a/sepolicy/kernel.te b/sepolicy/kernel.te
new file mode 100644
index 0000000..068c576
--- /dev/null
+++ b/sepolicy/kernel.te
@@ -0,0 +1,2 @@
+allow kernel persist_file:dir search;
+allow kernel persist_file:file r_file_perms;
diff --git a/thermal-engine-vr.conf b/thermal-engine-vr.conf
index bed4c59..d8ed702 100755
--- a/thermal-engine-vr.conf
+++ b/thermal-engine-vr.conf
@@ -13,8 +13,8 @@
sampling 1000
thresholds 50000
thresholds_clr 46000
-actions cluster0+cluster1+gpu+battery
-action_info 883200+902400+342000000+3
+actions cluster0+cluster1+gpu+battery+report
+action_info 883200+902400+342000000+3+1
[SKIN_SHUTDOWN]
algo_type monitor
@@ -31,5 +31,5 @@
sampling 1000
thresholds 62000
thresholds_clr 58000
-actions cluster0+cluster1+gpu
-action_info 883200+902400+342000000
+actions cluster0+cluster1+gpu+report
+action_info 883200+902400+342000000+1
diff --git a/thermal-engine.conf b/thermal-engine.conf
index 8c810bd..80a0ffe 100755
--- a/thermal-engine.conf
+++ b/thermal-engine.conf
@@ -54,8 +54,8 @@
sensor bd_therm2
thresholds 48000 50000 52000
thresholds_clr 47000 49000 51000
-actions cluster0+cluster1+gpu cluster0+cluster1+gpu cluster0+cluster1+gpu
-action_info 1094400+1190400+414000000 883200+902400+342000000 300000+300000+257000000
+actions cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report
+action_info 1094400+1190400+414000000+1 883200+902400+342000000+1 300000+300000+257000000+1
[BATTERY-MONITOR2]
algo_type monitor
@@ -75,6 +75,15 @@
actions shutdown
action_info 1
+[THROTTLING-NOTIFY2]
+algo_type monitor
+sampling 2000
+sensor bd_therm2
+thresholds 38000
+thresholds_clr 37000
+actions report
+action_info 1
+
[SKIN-MID-FLOOR]
algo_type ss
sampling 2000
@@ -121,8 +130,8 @@
sensor bd_therm
thresholds 58000 60000 64000
thresholds_clr 57000 59000 63000
-actions cluster0+cluster1+gpu cluster0+cluster1+gpu cluster0+cluster1+gpu
-action_info 1094400+1190400+414000000 883200+902400+342000000 300000+300000+257000000
+actions cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report
+action_info 1094400+1190400+414000000+1 883200+902400+342000000+1 300000+300000+257000000+1
[SKIN-SHUTDOWN]
algo_type monitor
@@ -132,3 +141,12 @@
thresholds_clr 65000
actions shutdown
action_info 1
+
+[THROTTLING-NOTIFY]
+algo_type monitor
+sampling 2000
+sensor bd_therm
+thresholds 49000
+thresholds_clr 48000
+actions report
+action_info 1
