From 2ed8019dd468c9a466dc14712b3a0962b7472a10 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Mon, 8 Feb 2021 20:12:21 +0100
Subject: [PATCH] sm8250-common: Import config/script changes from OOS 11.0.4.4

Change-Id: I90d3f654f18d90d25f7b2321dbfebfecc79ee958
---
 audio/sound_trigger_platform_info.xml |  4 +++
 configs/media_codecs_c2.xml           |  8 -----
 rootdir/etc/init.oem.rc               | 46 ++++++++++++++++++++-------
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml
index 6d26c9a..9008453 100644
--- a/audio/sound_trigger_platform_info.xml
+++ b/audio/sound_trigger_platform_info.xml
@@ -262,6 +262,7 @@
     <!-- Google Hotword -->
     <sound_model_config>
         <param vendor_uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" />
+        <param get_module_version="true" />
         <param execution_type="ADSP" />
         <param max_ape_phrases="1" />
         <param max_ape_users="1" />
@@ -293,6 +294,7 @@
             <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
             <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
+            <param version_ids="0x18000001, 0x0, 0x18000101" />
         </lsm_usecase>
         <lsm_usecase>
             <param capture_device="HANDSET" />
@@ -318,6 +320,7 @@
             <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
             <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
+            <param version_ids="0x18000001, 0x0, 0x18000101" />
         </lsm_usecase>
         <lsm_usecase>
             <param capture_device="HEADSET" />
@@ -330,6 +333,7 @@
             <param unload_sound_model_ids="0x18000001, 0x0, 0x00012C15" />
             <param custom_config_ids="0x18000001, 0x0, 0x00012C20" />
             <param lab_dam_cfg_ids="0x00012C08, 0x0, 0x000102C4" />
+            <param version_ids="0x18000001, 0x0, 0x18000101" />
         </lsm_usecase>
 
         <!-- format: "ADPCM_packet" or "PCM_packet" !-->
diff --git a/configs/media_codecs_c2.xml b/configs/media_codecs_c2.xml
index e44a044..5dca84b 100644
--- a/configs/media_codecs_c2.xml
+++ b/configs/media_codecs_c2.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Included>
-    <Decoders>
-        <MediaCodec name="c2.nokia.ozoaudio.decoder" type="audio/ozoaudio">
-            <Limit name="channel-count" max="8" />
-            <Limit name="sample-rate" ranges="48000" />
-            <Limit name="bitrate" range="8000-960000" />
-        </MediaCodec>
-    </Decoders>
-
     <Encoders>
         <MediaCodec name="c2.nokia.ozoaudio.encoder" type="audio/ozoaudio">
             <Limit name="sample-rate" ranges="48000" />
diff --git a/rootdir/etc/init.oem.rc b/rootdir/etc/init.oem.rc
index 548fa15..0b90d99 100644
--- a/rootdir/etc/init.oem.rc
+++ b/rootdir/etc/init.oem.rc
@@ -106,9 +106,14 @@ on fs
 #add for tp firmware update
     write /sys/devices/platform/soc/a94000.i2c/i2c-4/4-004b/tp_fw_update 0
     write /sys/devices/platform/soc/a94000.i2c/i2c-4/4-0048/tp_fw_update 0
+    write /sys/devices/platform/soc/984000.i2c/i2c-4/4-005d/tp_fw_update 0
+    write /sys/devices/platform/soc/984000.i2c/i2c-4/4-0048/tp_fw_update 0
 
 #add for tp debug log
     chown system system /proc/touchpanel/tp_debug_log
+    chown system system /proc/touchpanel/gesture_enable
+    chown system system /proc/touchpanel/gesture_switch
+    chown system system /proc/touchpanel/tpedge_limit_enable
     chown system system /proc/touchpanel/tp_switch_dead_zone
     chown system system /proc/touchpanel/tp_switch_corner_dead_l_zone
     chown system system /proc/touchpanel/tp_switch_corner_dead_p_zone
@@ -419,17 +424,11 @@ service service_wifi_txEnable  /vendor/bin/sh /vendor/bin/wifi_txEnable
     oneshot
 
 on init
-    mount tmpfs none /sys/fs/cgroup mode=0750,uid=0,gid=1000
-    mkdir /sys/fs/cgroup/freezer 0750 root system
-    mount cgroup none /sys/fs/cgroup/freezer  freezer
-    chmod 777 /sys/fs/cgroup/freezer
-
-    mkdir /sys/fs/cgroup/net_cls
-    chmod 777 /sys/fs/cgroup/net_cls
-    mount cgroup  none /sys/fs/cgroup/net_cls net_cls
-    chmod 777 /sys/fs/cgroup/net_cls/tasks
-    mkdir /sys/fs/cgroup/net_cls/background 0777
-    chmod 777 /sys/fs/cgroup/net_cls/background/tasks
+    mkdir /dev/op_cgroup 0750 root system
+    mount tmpfs none /dev/op_cgroup mode=0750,uid=0,gid=1000
+    mkdir /dev/op_cgroup/freezer 0750 root system
+    mount cgroup none /dev/op_cgroup/freezer  freezer
+    chmod 777 /dev/op_cgroup/freezer
 #ifdef VENDOR_EDIT
     setprop persist.vendor.mdm_helper.fail_action cold_reset,s3_reset,panic
 #endif
@@ -684,6 +683,31 @@ service terminate_sniffer /vendor/bin/sh /vendor/bin/terminate_sniffer.sh
     group root
     disabled
     oneshot
+
+#v-krishna.rao@Connectivity, 2020/12/21 , servce to set iwpriv contention for btwifi coex debugging
+on property:persist.vendor.oem.btwificoex.debug=1
+    start startiwprivcontention
+
+on property:persist.vendor.oem.btwificoex.debug=0
+    start stopiwprivcontention
+
+on property:wlan.driver.status=ok && property:persist.vendor.oem.btwificoex.debug=1
+    start startiwprivcontention
+
+service startiwprivcontention /vendor/bin/sh /vendor/bin/startcontention.sh 1
+    class main
+    user root
+    group root
+    disabled
+    oneshot
+
+service stopiwprivcontention /vendor/bin/sh /vendor/bin/startcontention.sh 0
+    class main
+    user root
+    group root
+    disabled
+    oneshot
+
 #endif
 
 #ifdef VENDOR_EDIT