diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml
index 40e53bb..e5dedfe 100644
--- a/audio/audio_policy_volumes.xml
+++ b/audio/audio_policy_volumes.xml
@@ -11,7 +11,7 @@ volume index from 0 to 100.
- 0,-3600
+ 0,-3000
33,-2300
66,-1600
100,0
@@ -40,14 +40,14 @@ volume index from 0 to 100.
ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
-
-
- 1,-6000
- 44,-2000
- 66,-1200
+
+ 1,-5800
+ 34,-3200
+ 67,-1600
100,0
-
+
+
66,-2200
100,-1800
-
-
-
+ 1,-3800
+ 33,-2800
+ 66,-2000
+ 100,-1300
+
+
+ 1,-2700
+ 33,-1600
+ 66,-700
+ 100,0
+
+
diff --git a/audio/default_volume_tables.xml b/audio/default_volume_tables.xml
index 6b8cb96..cfac8e5 100644
--- a/audio/default_volume_tables.xml
+++ b/audio/default_volume_tables.xml
@@ -20,24 +20,24 @@
- 1,-4000
- 33,-2870
- 66,-1450
+ 1,-3900
+ 33,-2600
+ 66,-1300
100,0
- 1,-6000
- 33,-4000
- 66,-2000
+ 1,-4000
+ 70,-1600
+ 84,-800
100,0
- 1,-3800
- 33,-2800
- 66,-1800
- 100,-800
+ 1,-3200
+ 33,-2700
+ 66,-2200
+ 100,-1700
@@ -48,9 +48,9 @@
- 0,-2400
- 33,-1600
- 66,-800
+ 0,-2100
+ 33,-1400
+ 66,-700
100,0
@@ -62,9 +62,12 @@
- 1,-6000
- 33,-4000
- 66,-2000
+ 1,-5000
+ 30,-3300
+ 43,-2000
+ 65,-1200
+ 85,-600
+ 93,-300
100,0
diff --git a/audio/audio_platform_info.xml b/audio/sku_yupik/audio_platform_info.xml
similarity index 77%
rename from audio/audio_platform_info.xml
rename to audio/sku_yupik/audio_platform_info.xml
index f7746e5..aafe4a4 100644
--- a/audio/audio_platform_info.xml
+++ b/audio/sku_yupik/audio_platform_info.xml
@@ -1,5 +1,5 @@
-
+
@@ -32,11 +32,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -49,13 +77,13 @@
-
+
-
+
+
-
@@ -64,11 +92,11 @@
-
-
+
+
-
+
@@ -76,34 +104,36 @@
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -116,14 +146,16 @@
-
+
+
+
-
+
@@ -131,18 +163,12 @@
-
-
-
-
-
-
-
-
+
+
@@ -156,26 +182,38 @@
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -187,107 +225,84 @@
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
+
@@ -297,13 +312,13 @@
-
-
+
+
@@ -311,24 +326,18 @@
-
-
-
-
+
+
+
-
-
-
-
-
@@ -340,15 +349,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -359,23 +364,17 @@
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
@@ -505,6 +504,14 @@
+
+
+
+
+
diff --git a/audio/mixer_paths.xml b/audio/sku_yupik/mixer_paths.xml
similarity index 51%
rename from audio/mixer_paths.xml
rename to audio/sku_yupik/mixer_paths.xml
index 2b4c0e1..735c770 100644
--- a/audio/mixer_paths.xml
+++ b/audio/sku_yupik/mixer_paths.xml
@@ -26,6 +26,15 @@
+
+
+
+
+
+
+
+
+
@@ -49,28 +58,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -110,6 +103,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -145,9 +152,12 @@
+
-
-
+
+
+
+
@@ -155,12 +165,13 @@
+
+
-
@@ -173,6 +184,8 @@
+
+
@@ -180,7 +193,7 @@
-
+
@@ -200,7 +213,7 @@
-
+
@@ -219,11 +232,8 @@
-
-
-
-
-
+
+
@@ -246,7 +256,7 @@
-
+
@@ -264,19 +274,20 @@
-
-
+
+
+
@@ -305,17 +316,22 @@
-
+
+
+
-
-
-
+
+
+
+
+
+
@@ -325,6 +341,14 @@
+
+
+
+
+
+
+
+
@@ -349,6 +373,11 @@
+
+
+
+
+
@@ -358,10 +387,10 @@
-
-
-
-
+
+
+
+
@@ -376,6 +405,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -389,28 +443,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
+
+
-
-
+
+
@@ -423,35 +490,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -465,28 +508,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -495,16 +518,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -519,56 +532,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -576,6 +544,7 @@
+
@@ -597,12 +566,7 @@
-
-
-
-
-
-
+
@@ -615,75 +579,35 @@
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -691,6 +615,7 @@
+
@@ -698,26 +623,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -732,12 +637,7 @@
-
-
-
-
-
-
+
@@ -750,62 +650,35 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
@@ -817,25 +690,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -843,6 +699,7 @@
+
@@ -850,26 +707,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -884,100 +721,42 @@
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -985,26 +764,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1019,12 +778,7 @@
-
-
-
-
-
-
+
@@ -1039,61 +793,41 @@
-
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
@@ -1108,11 +842,6 @@
-
-
-
-
-
@@ -1127,12 +856,7 @@
-
-
-
-
-
-
+
@@ -1147,585 +871,28 @@
-
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1741,6 +908,7 @@
+
@@ -1765,6 +933,7 @@
+
@@ -1772,14 +941,14 @@
-
-
-
-
+
+
+
+
@@ -1789,6 +958,7 @@
+
@@ -1813,6 +983,7 @@
+
@@ -1820,26 +991,22 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1884,34 +1051,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1944,34 +1083,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2005,35 +1116,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2049,11 +1131,11 @@
-
+
-
+
@@ -2079,6 +1161,7 @@
+
@@ -2088,7 +1171,7 @@
-
+
@@ -2102,17 +1185,18 @@
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
@@ -2137,6 +1221,7 @@
+
@@ -2159,36 +1244,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -2205,6 +1271,7 @@
+
@@ -2227,18 +1294,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -2249,12 +1306,11 @@
-
+
-
-
-
+
+
@@ -2266,11 +1322,11 @@
-
+
@@ -2279,7 +1335,6 @@
-
@@ -2288,54 +1343,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -2347,6 +1369,7 @@
+
@@ -2354,24 +1377,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2388,164 +1393,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
+
-
-
+
+
@@ -2557,13 +1434,8 @@
-
-
-
-
-
-
+
@@ -2590,55 +1462,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -2646,7 +1472,6 @@
-
@@ -2657,10 +1482,6 @@
-
-
-
-
@@ -2669,18 +1490,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2697,14 +1506,14 @@
-
-
-
-
+
+
+
+
@@ -2713,26 +1522,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2745,26 +1534,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2781,10 +1550,6 @@
-
-
-
-
@@ -2797,18 +1562,10 @@
-
-
-
-
-
-
-
-
@@ -2817,16 +1574,9 @@
-
-
-
-
-
-
-
@@ -2840,18 +1590,10 @@
-
-
-
-
-
-
-
-
@@ -2864,10 +1606,6 @@
-
-
-
-
@@ -2888,6 +1626,10 @@
+
+
+
+
@@ -2896,10 +1638,6 @@
-
-
-
-
@@ -2907,89 +1645,190 @@
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -2998,11 +1837,6 @@
-
-
-
-
-
@@ -3017,26 +1851,13 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3057,21 +1878,11 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
+
@@ -3108,6 +1919,10 @@
+
+
+
+
@@ -3116,8 +1931,7 @@
-
-
+
@@ -3139,25 +1953,9 @@
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3190,19 +1988,10 @@
-
-
-
-
-
-
-
-
-
@@ -3212,84 +2001,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
@@ -3305,147 +2032,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3458,21 +2066,17 @@
-
+
-
+
-
-
-
-
@@ -3481,10 +2085,6 @@
-
-
-
-
@@ -3501,12 +2101,7 @@
-
-
-
-
-
-
+
@@ -3535,12 +2130,7 @@
-
-
-
-
-
-
+
@@ -3549,7 +2139,7 @@
-
+
@@ -3564,6 +2154,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3595,10 +2197,13 @@
-
+
-
-
+
+
+
+
+
diff --git a/configs/idc/uinput-fpc.idc b/configs/idc/uinput-fpc.idc
deleted file mode 100644
index 5b628cf..0000000
--- a/configs/idc/uinput-fpc.idc
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# FPC1020 Touch sensor driver
-#
-
-device.internal = 1
-
-keyboard.layout = uinput-fpc
-keyboard.builtIn = 1
-keyboard.orientationAware = 1
-
diff --git a/configs/idc/uinput_nav.idc b/configs/idc/uinput_nav.idc
index ce6426c..76641fb 100644
--- a/configs/idc/uinput_nav.idc
+++ b/configs/idc/uinput_nav.idc
@@ -1,9 +1,5 @@
-#
-# GF3626_Z9 gesture sensor driver
-#
+# Goodix side-type fingerprint sensor
device.internal = 1
-
keyboard.layout = uinput_nav
keyboard.builtIn = 1
keyboard.orientationAware = 1
-
diff --git a/configs/keylayout/uinput-fpc.kl b/configs/keylayout/uinput-fpc.kl
deleted file mode 100644
index b759909..0000000
--- a/configs/keylayout/uinput-fpc.kl
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# FPC1020 Touch sensor driver
-#
-#
-
-# fpc1020 "finger present"
-key 618 SYSTEM_NAVIGATION_UP
-key 619 SYSTEM_NAVIGATION_DOWN
-key 622 SYSTEM_NAVIGATION_LEFT
diff --git a/configs/keylayout/uinput_nav.kl b/configs/keylayout/uinput_nav.kl
index f172e55..9a92198 100644
--- a/configs/keylayout/uinput_nav.kl
+++ b/configs/keylayout/uinput_nav.kl
@@ -1,9 +1,7 @@
-#
-# GF3626_Z9 gesture sensor driver
-#
+# Goodix side-type fingerprint sensor
-key 618 SYSTEM_NAVIGATION_UP
-key 619 SYSTEM_NAVIGATION_DOWN
-# double tap
-key 622 SYSTEM_NAVIGATION_LEFT
+key 103 SYSTEM_NAVIGATION_UP
+key 108 SYSTEM_NAVIGATION_DOWN
+# use SYSTEM_NAVIGATION_LEFT for double-tap gesture
+key 115 SYSTEM_NAVIGATION_LEFT
diff --git a/device.mk b/device.mk
index 193b0ce..7a74f42 100644
--- a/device.mk
+++ b/device.mk
@@ -38,19 +38,17 @@ PRODUCT_PACKAGES += \
# Audio
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
$(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
$(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
- $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
+ $(LOCAL_PATH)/audio/sku_yupik/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/audio_platform_info.xml \
+ $(LOCAL_PATH)/audio/sku_yupik/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/mixer_paths.xml
# Fingerprint
PRODUCT_PACKAGES += \
android.hardware.biometrics.fingerprint@2.1-service.berlin
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/idc/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc \
$(LOCAL_PATH)/configs/idc/uinput_nav.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput_nav.idc \
- $(LOCAL_PATH)/configs/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \
$(LOCAL_PATH)/configs/keylayout/uinput_nav.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput_nav.kl
# Init
@@ -67,21 +65,22 @@ PRODUCT_PACKAGES += \
# Media
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/media/media_profiles_kona.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_kona.xml \
- $(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
+ $(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \
+ $(LOCAL_PATH)/media/media_profiles_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v0.xml \
+ $(LOCAL_PATH)/media/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml
# NFC
PRODUCT_PACKAGES += \
android.hardware.nfc@1.2.vendor \
android.hardware.nfc@1.2-service.st \
android.hardware.secure_element@1.2.vendor \
- android.hardware.secure_element@1.2-service.st \
- com.android.nfc_extras \
- libchrome.vendor \
+ android.hardware.secure_element@1.2-service.st \
+ com.android.nfc_extras \
+ libchrome.vendor \
NfcNci \
- SecureElement \
+ SecureElement \
Tag \
- nfc_nci.st21nfc.default
+ nfc_nci.st21nfc.default
# Permissions
PRODUCT_COPY_FILES += \
diff --git a/media/media_profiles_vendor.xml b/media/media_profiles_vendor.xml
index 43d1609..1e9a83d 100644
--- a/media/media_profiles_vendor.xml
+++ b/media/media_profiles_vendor.xml
@@ -47,7 +47,7 @@
-
+
@@ -109,8 +109,8 @@
-
@@ -134,9 +134,22 @@
channels="1" />
+
+
+
+
+
+
@@ -149,7 +162,7 @@
@@ -173,9 +186,22 @@
channels="2" />
+
+
+
+
+
+
-
@@ -201,8 +227,8 @@
-
@@ -227,6 +253,20 @@
channels="1" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1535,37 +1741,21 @@
In other words, the applications won't be able to use the codec
or query the capabilities of the codec at all if it is disabled
-->
-
+
-
-
-
-
-
+
-
-
-
-
+
diff --git a/media/media_profiles_yupik_v1.xml b/media/media_profiles_yupik_v1.xml
new file mode 100644
index 0000000..e12adfb
--- /dev/null
+++ b/media/media_profiles_yupik_v1.xml
@@ -0,0 +1,1827 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 49ede25..dac8ea2 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -415,7 +415,6 @@ vendor/lib64/libgf_ca.so
# NFC
vendor/bin/STFlashTool
-vendor/etc/init/hw/init.vendor.st21nfc.rc
# NFC - configs
vendor/etc/libnfc-hal-st.conf
diff --git a/rootdir/bin/init.oem.fingerprint.overlay.sh b/rootdir/bin/init.oem.fingerprint.overlay.sh
deleted file mode 100755
index 270cecc..0000000
--- a/rootdir/bin/init.oem.fingerprint.overlay.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/vendor/bin/sh
-#
-# Identify fingerprint sensor model
-#
-# Copyright (c) 2019 Lenovo
-# All rights reserved.
-#
-# Changed Log:
-# ---------------------------------
-# April 15, 2019 chengql2@lenovo.com Initial version
-# April 28, 2019 chengql2 Add fps_id creating step
-# December 2, 2019 chengql2 Store fps_id into persist fs, and identify sensor
-# again when secure unit boots as factory mode.
-
-script_name=${0##*/}
-script_name=${script_name%.*}
-function notice {
- log -t "$scriptname" -p i "$*"
-}
-
-persist_fps_id=/mnt/vendor/persist/fps/vendor_id
-
-FPS_VENDOR_GOODIX=goodix
-FPS_VENDOR_FPC=fpc
-FPS_VENDOR_NONE=none
-
-PROP_FPS_IDENT=vendor.hw.fps.ident
-MAX_TIMES=20
-
-function ident_fps {
- log "- install FPC driver"
- insmod /vendor/lib/modules/fpc1020_mmi.ko
- sleep 1
- notice "- identify FPC sensor"
- setprop $PROP_FPS_IDENT ""
- start fpc_ident
- for i in $(seq 1 $MAX_TIMES)
- do
- sleep 0.1
- ident_status=$(getprop $PROP_FPS_IDENT)
- notice "-result : $ident_status"
- if [ $ident_status == $FPS_VENDOR_FPC ]; then
- log "ok"
- echo $FPS_VENDOR_FPC > $persist_fps_id
- return 0
- elif [ $ident_status == $FPS_VENDOR_NONE ]; then
- notice "fail"
- notice "- unload FPC driver"
- rmmod fpc1020_mmi
- break
- fi
- done
-
- notice "- install Goodix driver"
- insmod /vendor/lib/modules/goodix_fod_mmi.ko
- echo $FPS_VENDOR_GOODIX > $persist_fps_id
- return 0
-}
-
-if [ ! -f $persist_fps_id ]; then
- ident_fps
- return $?
-fi
-
-fps_vendor=$(cat $persist_fps_id)
-if [ -z $fps_vendor ]; then
- fps_vendor=$FPS_VENDOR_NONE
-fi
-notice "FPS vendor: $fps_vendor"
-
-if [ $fps_vendor == $FPS_VENDOR_GOODIX ]; then
- notice "- install Goodix driver"
- insmod /vendor/lib/modules/goodix_fod_mmi.ko
- return $?
-fi
-
-if [ $fps_vendor == $FPS_VENDOR_FPC ]; then
- notice "- install FPC driver"
- insmod /vendor/lib/modules/fpc1020_mmi.ko
- return $?
-fi
-
-ident_fps
-return $?
diff --git a/rootdir/bin/init.oem.fingerprint2.sh b/rootdir/bin/init.oem.fingerprint2.sh
deleted file mode 100755
index 831e312..0000000
--- a/rootdir/bin/init.oem.fingerprint2.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/vendor/bin/sh
-#
-# Start indicated fingerprint HAL service
-#
-# Copyright (c) 2019 Lenovo
-# All rights reserved.
-#
-# April 15, 2019 chengql2@lenovo.com Initial version
-# December 2, 2019 chengql2 Store fps_id into persist fs
-
-script_name=${0##*/}
-script_name=${script_name%.*}
-function notice {
- log -t "$scriptname" -p i "$*"
-}
-
-persist_fps_id=/mnt/vendor/persist/fps/vendor_id
-persist_fps_id2=/mnt/vendor/persist/fps/last_vendor_id
-MAX_TIMES=100
-
-if [ ! -f $persist_fps_id ]; then
- notice "warn: no associated persist file found"
- return -1
-fi
-FPS_VENDOR_NONE=none
-FPS_VENDOR_GOODIX=goodix
-FPS_VENDOR_FPC=fpc
-
-prop_fps_status=vendor.hw.fingerprint.status
-prop_persist_fps=persist.vendor.hardware.fingerprint
-
-FPS_STATUS_NONE=none
-FPS_STATUS_OK=ok
-
-fps_vendor2=$(cat $persist_fps_id2)
-if [ -z $fps_vendor2 ]; then
- fps_vendor2=$FPS_VENDOR_NONE
-fi
-notice "FPS vendor (last): $fps_vendor2"
-fps_vendor=$(cat $persist_fps_id)
-if [ -z $fps_vendor ]; then
- fps_vendor=$FPS_VENDOR_NONE
-fi
-notice "FPS vendor: $fps_vendor"
-
-if [ $fps_vendor == $FPS_STATUS_NONE ]; then
- notice "warn: boot as the last FPS"
- fps=$fps_vendor2
-else
- fps=$fps_vendor
-fi
-
-for i in $(seq 1 2)
-do
-
-setprop $prop_fps_status $FPS_STATUS_NONE
-if [ $fps == $FPS_VENDOR_FPC ]; then
- notice "start fps_hal"
- start fps_hal
-else
- notice "start goodix_hal"
- start goodix_hal
-fi
-
-notice "wait for HAL finish ..."
-fps_status=$(getprop $prop_fps_status)
-for ii in $(seq 1 $MAX_TIMES)
-do
-# notice "check fps vendor status: $fps_status"
- if [ $fps_status != $FPS_STATUS_NONE ]; then
- break
- fi
- sleep 0.2
- fps_status=$(getprop $prop_fps_status)
-done
-notice "fingerprint HAL status: $fps_status"
-
-if [ $fps_status == $FPS_STATUS_OK ]; then
- notice "HAL success"
- setprop $prop_persist_fps $fps
- if [ $fps_vendor2 == $fps ]; then
- return 0
- fi
- notice "- update FPS vendor (last)"
- echo $fps > $persist_fps_id2
- notice "- done"
- return 0
-fi
-
-if [ $fps == $fps_vendor2 ]; then
- if [ $fps == $FPS_VENDOR_FPC ]; then
- rmmod fpc1020_mmi
- sleep 0.1
- stop fps_hal
- sleep 0.1
- insmod /vendor/lib/modules/goodix_fod_mmi.ko
- fps=$FPS_VENDOR_GOODIX
- else
- rmmod goodix_fod_mmi
- sleep 0.1
- stop goodix_hal
- sleep 0.1
- insmod /vendor/lib/modules/fpc1020_mmi.ko
- fps=$FPS_VENDOR_FPC
- fi
- notice "- update FPS vendor"
- echo $fps > $persist_fps_id
- sleep 1
-else
- notice "error: HAL fail unload ko"
- if [ $fps == $FPS_VENDOR_FPC ]; then
- rmmod fpc1020_mmi
- else
- rmmod goodix_fod_mmi
- fi
- setprop $prop_persist_fps $FPS_VENDOR_NONE
- echo $FPS_VENDOR_NONE > $persist_fps_id
-
- notice "- done"
- return 1
-fi
-
-done
diff --git a/rootdir/etc/init/hw/init.mmi.overlay.rc b/rootdir/etc/init/hw/init.mmi.overlay.rc
index 6372fda..bf8994f 100644
--- a/rootdir/etc/init/hw/init.mmi.overlay.rc
+++ b/rootdir/etc/init/hw/init.mmi.overlay.rc
@@ -1,158 +1,90 @@
-# NFC ST21NFC
import /vendor/etc/init/hw/init.vendor.st21nfc.rc
-on early-init
- setprop ro.vendor.device_edition ${ro.boot.edition}
- exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules qpnp-smbcharger-mmi qpnp_adaptive_charge
- exec u:r:vendor_modprove:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules touchscreen_mmi.ko stmicro_mmi.ko
+on early-init && property:ro.bootmode=mot-factory
+ insmod /vendor/lib/modules/moto_f_usbnet.ko
-on mmi-priority
- # Only high priority MMI DLKMs loaded here
- # For instance, sensor_class referenced from several DLKMs
- # and needs to load first. Touchscreen might need extra time
- # to perform firmware update if necessary
- setprop vendor.mmi_init.stage priority
- exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules sensors_class.ko
+on early-init
+ exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/${ro.vendor.mot.gki.path} mmi_annotate mmi_info mmi_relay
+
+on early-init
+ insmod /vendor/lib/modules/bm_adsp_ulog.ko
+ insmod /vendor/lib/modules/mmi_charger.ko
+ insmod /vendor/lib/modules/qti_glink_charger.ko
+ insmod /vendor/lib/modules/cirrus_wm_adsp.ko
+ insmod /vendor/lib/modules/cirrus_cs35l41.ko
+ insmod /vendor/lib/modules/mmi_sys_temp.ko
+ insmod /vendor/lib/modules/wl2864c.ko
+ insmod /vendor/lib/modules/goodix_mmi.ko
+ insmod /vendor/lib/modules/camera.ko
+ insmod /vendor/lib/modules/aw8695.ko
+ insmod /vendor/lib/modules/cci_intf.ko
+ insmod /vendor/lib/modules/qpnp_adaptive_charge.ko
+ start vendor.mmi_modules
+ wait_for_prop init.svc.vendor.mmi_modules stopped
on fs
- # Majority of MMI DLKMs should be in this group
- setprop vendor.mmi_init.stage common
- insmod /vendor/lib/modules/wl2866d.ko
- insmod /vendor/lib/modules/mmi_info.ko
- insmod /vendor/lib/modules/mmi_annotate.ko
- insmod /vendor/lib/modules/mmi_sys_temp.ko
- insmod /vendor/lib/modules/qpnp-power-on-mmi.ko
- insmod /vendor/lib/modules/bq2597x_mmi.ko
- insmod /vendor/lib/modules/mmi_parallel_charger.ko
- insmod /vendor/lib/modules/mmi_parallel_charger_qc3p.ko
- insmod /vendor/lib/modules/mmi_annotate.ko
- insmod /vendor/lib/modules/mmi_info.ko
- insmod /vendor/lib/modules/tzlog_dump.ko
- insmod /vendor/lib/modules/watchdog_cpu_ctx.ko
- insmod /vendor/lib/modules/mmi_relay.ko
- insmod /vendor/lib/modules/sx937x_sar.ko
- insmod /vendor/lib/modules/st21nfc.ko
- insmod /vendor/lib/modules/stmvl53l1.ko
- exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules aw882xx_k419.ko aw8695.ko
-
-on post-fs
- # "double tap" gesture
- chown system system /sys/class/sensors/dt-gesture/enable
- chmod 0660 /sys/class/sensors/dt-gesture/enable
- chown root input /sys/class/sensors/dt-gesture/enable_wakeup
- chmod 0660 /sys/class/sensors/dt-gesture/enable_wakeup
- chown root input /sys/class/sensors/dt-gesture/flush
- chmod 0660 /sys/class/sensors/dt-gesture/flush
- chown root input /sys/class/sensors/dt-gesture/max_latency
- chmod 0660 /sys/class/sensors/dt-gesture/max_latency
- chown root input /sys/class/sensors/dt-gesture/poll_delay
- chmod 0660 /sys/class/sensors/dt-gesture/poll_delay
-
-service vendor.vl53l1_daemon /vendor/bin/vl53l1_daemon
- class late_start
- user root
- group root
- socket vl53l1_daemon stream 660 root system
-
-service vendor.mmi-laser-sh /vendor/bin/init.mmi.laser.sh
- class core
- user root
- oneshot
-
-on init
- write /sys/block/zram0/comp_algorithm lz4
-
-on boot
- # Add for goodix fingerprint
- chown system system /dev/goodix_fp
- chmod 0664 /dev/goodix_fp
- mkdir /data/vendor/gf_data 0770 system system
- mkdir /mnt/vendor/persist/goodix 0770 system system
- # Add for CQA fps calibration test
- chown system system /sys/class/backlight/panel0-backlight/brightness
- chown system system /d/dri/0/debug/motUtil
- chmod 0666 /d/dri/0/debug/motUtil;
- chmod 0666 /sys/class/backlight/panel0-backlight/brightness
- # Set wls perms for HAL
- chown system system /sys/class/power_supply/wireless/device/tx_mode
- #Add for laser
- chown system system sys/class/laser/stmvl53l1/enable_sar
- chmod 0660 sys/class/laser/stmvl53l1/enable_sar
- chown system system sys/class/laser/stmvl53l1/set_delay_ms
- chmod 0660 sys/class/laser/stmvl53l1/set_delay_ms
- chown system system sys/class/laser/stmvl53l1/autonomous_config
- chmod 0660 sys/class/laser/stmvl53l1/autonomous_config
- chown system system sys/class/laser/stmvl53l1/enable_ps_sensor
- chmod 0660 sys/class/laser/stmvl53l1/enable_ps_sensor
- chown system system sys/class/laser/stmvl53l1/do_flush
- chmod 0660 sys/class/laser/stmvl53l1/do_flush
- chown system /sys/devices/virtual/laser/stmvl53l1/enable_sar
- chmod 0660 /sys/devices/virtual/laser/stmvl53l1/enable_sar
- chown system /sys/devices/virtual/laser/stmvl53l1/set_delay_ms
- chmod 0660 /sys/devices/virtual/laser/stmvl53l1/set_delay_ms
- chown system /sys/devices/virtual/laser/stmvl53l1/do_flush
- chmod 0660 /sys/devices/virtual/laser/stmvl53l1/do_flush
- chmod 0660 /sys/devices/virtual/laser/stmvl53l1/autonomous_config
- chown system /sys/devices/virtual/laser/stmvl53l1/autonomous_config
- chmod 0660 /sys/devices/virtual/laser/stmvl53l1/enable_ps_sensor
- chown system /sys/devices/virtual/laser/stmvl53l1/enable_ps_sensor
- chmod 0660 /sys/devices/virtual/laser/stmvl53l1/timing_budget
- chown system /sys/devices/virtual/laser/stmvl53l1/timing_budget
- chown system system /sys/devices/virtual/input/input1/timing_budget
- chmod 0660 /sys/devices/virtual/input/input1/timing_budget
- chmod 0664 /mnt/vendor/persist/camera/focus/offset_cal
- chmod 0664 /mnt/vendor/persist/camera/focus/cal_data
- # Touch grip suppression control
- chown system system /sys/class/touchscreen/primary/suppression
- chmod 0660 /sys/class/touchscreen/primary/suppression
- chown system system /sys/class/touchscreen/primary/pill_region
- chmod 0660 /sys/class/touchscreen/primary/pill_region
- chown system system /sys/class/touchscreen/primary/hold_distance
- chmod 0660 /sys/class/touchscreen/primary/hold_distance
- chown system system /sys/class/touchscreen/primary/gs_distance
- chmod 0660 /sys/class/touchscreen/primary/gs_distance
- chown system system /sys/class/touchscreen/primary/rotate
- chmod 0660 /sys/class/touchscreen/primary/rotate
- chown system system /sys/class/touchscreen/primary/interpolation
- chmod 0660 /sys/class/touchscreen/primary/interpolation
- chown system system /sys/class/touchscreen/primary/edge
- chmod 0660 /sys/class/touchscreen/primary/edge
- # Change ownership for capsensor
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch0/enable
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch0/poll_delay
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch1/enable
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch1/poll_delay
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch2/enable
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch2/poll_delay
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch3/enable
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch3/poll_delay
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch4/enable
- chown root input /sys/class/sensors/Moto\ CapSense\ Ch4/poll_delay
- chown system system /sys/class/capsense/reset
- chown system system /sys/class/capsense/int_state
- # Set adaptive charging perms for HAL
- chown system system /sys/module/qpnp_adaptive_charge/parameters/upper_limit
- chown system system /sys/module/qpnp_adaptive_charge/parameters/lower_limit
- write /proc/sys/kernel/hung_task_timeout_secs 120
- # Change ownership and permission for bq25960-standalone factory testing
- chown system system /sys/class/power_supply/bq25960-standalone/voltage_now
- chown system system /sys/class/power_supply/bq25960-standalone/charging_enabled
- chmod 0644 /sys/class/power_supply/bq25960-standalone/voltage_now
- chmod 0664 /sys/class/power_supply/bq25960-standalone/charging_enabled
-
-#fps dual sensor
-service vendor.ident-fps-overlay-sh /vendor/bin/init.oem.fingerprint.overlay.sh
- class core
- user root
- group drmrpc system
- oneshot
- disabled
-
-# Turn on led to indicate device on factory mode
-on property:ro.bootmode=mot-factory
- write /sys/class/leds/charging/brightness 255
+ # Goodix fingerprint sensor GF3626 reuses the driver "goodix_fod_mmi.ko"
+ insmod /vendor/lib/modules/goodix_fod_mmi.ko
on post-fs-data
+ mkdir /mnt/vendor/persist/tof 0755 vendor_tcmd camera
+ chown vendor_tcmd camera /mnt/vendor/persist/tof/refspad_cal
+ chown vendor_tcmd camera /mnt/vendor/persist/tof/xtalk_g1_cal
+ chown vendor_tcmd camera /mnt/vendor/persist/tof/xtalk_shape_cal
+ chown vendor_tcmd camera /mnt/vendor/persist/tof/xtalk_production_cal
+ chown vendor_tcmd camera /mnt/vendor/persist/tof/offset_cal
+ chmod 0640 /mnt/vendor/persist/tof/refspad_cal
+ chmod 0640 /mnt/vendor/persist/tof/xtalk_g1_cal
+ chmod 0640 /mnt/vendor/persist/tof/xtalk_shape_cal
+ chmod 0640 /mnt/vendor/persist/tof/xtalk_production_cal
+ chmod 0640 /mnt/vendor/persist/tof/offset_cal
+ # Param updater data for various modules
+ mkdir /data/vendor/param 0775 system system
mkdir /data/vendor/tzstorage/goodix 0770 system system
- exec_start vendor.ident-fps-overlay-sh
+
+on early-boot
+ # Goodix fingerprint
+ chown system system /dev/goodix_fp
+ chmod 0664 /dev/goodix_fp
+
+on boot
+ # allow TCMD to access cci for OIS test
+ chmod 0660 /dev/cci_intf
+ chown system camera /dev/cci_intf
+
+ #change adsp pmic test command file access permission
+ chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/tcmd
+ chown vendor_tcmd system /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_pmic_icl
+ chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/tcmd
+ chmod 0660 /sys/devices/platform/soc/soc:qcom,pmic_glink/soc:qcom,pmic_glink:mmi,qti-glink-charger/force_pmic_icl
+ # Touch game mode control
+ chown system system /sys/class/touchscreen/primary/rotate
+ chmod 0660 /sys/class/touchscreen/primary/rotate
+ chown system system /sys/class/touchscreen/primary/interpolation
+ chmod 0660 /sys/class/touchscreen/primary/interpolation
+ chown system system /sys/class/touchscreen/primary/edge
+ chmod 0660 /sys/class/touchscreen/primary/edge
+ chown system system /sys/class/touchscreen/primary/first_filter
+ chmod 0660 /sys/class/touchscreen/primary/first_filter
+ chown system system /sys/class/touchscreen/primary/sensitivity
+ chmod 0660 /sys/class/touchscreen/primary/sensitivity
+ # Set adaptive charging perms for HAL
+ chown system system /sys/module/qpnp_adaptive_charge/parameters/upper_limit
+ chown system system /sys/module/qpnp_adaptive_charge/parameters/lower_limit
+ # touch screen calibration file
+ mkdir /mnt/vendor/persist/touch
+ chown vendor_tcmd system /mnt/vendor/persist/touch
+ chmod 0775 /mnt/vendor/persist/touch
+
+service capsense_reset /system/vendor/bin/capsense_reset
+ class core
+ user system
+ group system input
+ disabled
+
+on property:sys.boot_completed=1
+ start capsense_reset
+
+on property:persist.vendor.paramfile.parse_panel=1
+ write /sys/devices/platform/soc/soc:qcom,dsi-display-primary/dsi_display_parse_para "5"
diff --git a/vendor.prop b/vendor.prop
index b322dc4..c328aa7 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,12 +1,8 @@
# Camera
persist.vendor.camera.physical.num=4
-# Display
-vendor.display.enable_camera_smooth=1
-vendor.display.enable_allow_idle_fallback=1
-
# Motorola
-ro.mot.build.customerid=retail
+ro.mot.build.customerid=global
# NFC
-ro.venndor.hw.nfc=st
+ro.vendor.hw.nfc=st