Merge remote-tracking branch 'upstream/lineage-22.1' into cr11-5.10

OWNERS

@@ -1,4 +1,4 @@
 per-file powerhint.json = [email protected],[email protected],[email protected],[email protected]
 
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk,*/BoardConfig.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS

audio/lynx/tuning/fortemedia/BLUETOOTH.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  BLUETOOTH
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2023-08-15 15:10:51
+#SAVE_TIME  2024-07-04 16:09:14
 
 #CASE_NAME  BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -533,8 +533,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -3202,8 +3202,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -5871,8 +5871,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -11209,8 +11209,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH

audio/lynx/tuning/fortemedia/HANDSET.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HANDSET
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-21 10:42:17
+#SAVE_TIME  2024-07-04 16:04:34
 
 #CASE_NAME  HANDSET-HANDSET-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -533,8 +533,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x6000    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -3202,8 +3202,8 @@
 521    0x0000    //TX_GSC_RTOL_TH
 522    0x0000    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -5871,8 +5871,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -8540,8 +8540,8 @@
 521    0x7FFF    //TX_GSC_RTOL_TH
 522    0x7FFF    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -11209,8 +11209,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x6000    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -13878,8 +13878,8 @@
 521    0x0000    //TX_GSC_RTOL_TH
 522    0x0000    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -16547,8 +16547,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -19216,8 +19216,8 @@
 521    0x7FFF    //TX_GSC_RTOL_TH
 522    0x7FFF    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -21885,8 +21885,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -24554,8 +24554,8 @@
 521    0x7FFF    //TX_GSC_RTOL_TH
 522    0x7FFF    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -27223,8 +27223,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -29892,8 +29892,8 @@
 521    0x7FFF    //TX_GSC_RTOL_TH
 522    0x7FFF    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -32561,8 +32561,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -35230,8 +35230,8 @@
 521    0x7FFF    //TX_GSC_RTOL_TH
 522    0x7FFF    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -37899,8 +37899,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -40568,8 +40568,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x6000    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -43237,8 +43237,8 @@
 521    0x0000    //TX_GSC_RTOL_TH
 522    0x0000    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -45906,8 +45906,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -48575,8 +48575,8 @@
 521    0x7FFF    //TX_GSC_RTOL_TH
 522    0x7FFF    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -51244,8 +51244,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x6000    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -53913,8 +53913,8 @@
 521    0x0000    //TX_GSC_RTOL_TH
 522    0x0000    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -56582,8 +56582,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -59251,8 +59251,8 @@
 521    0x7FFF    //TX_GSC_RTOL_TH
 522    0x7FFF    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -61920,8 +61920,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH

audio/lynx/tuning/fortemedia/HANDSFREE.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HANDSFREE
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2023-08-15 15:10:19
+#SAVE_TIME  2024-07-04 16:04:55
 
 #CASE_NAME  HANDSFREE-HANDSFREE-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -533,8 +533,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -3202,8 +3202,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -5871,8 +5871,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -8540,8 +8540,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -11209,8 +11209,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -13878,8 +13878,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -16547,8 +16547,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -19216,8 +19216,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -21885,8 +21885,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -24554,8 +24554,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH

audio/lynx/tuning/fortemedia/HEADSET.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HEADSET
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2023-08-15 15:11:19
+#SAVE_TIME  2024-07-04 16:17:49
 
 #CASE_NAME  HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -27223,8 +27223,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -29892,8 +29892,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -32561,8 +32561,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -37899,8 +37899,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -67258,8 +67258,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -69927,8 +69927,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -72596,8 +72596,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
@@ -77934,8 +77934,8 @@
 521    0x3A98    //TX_GSC_RTOL_TH
 522    0x3A98    //TX_GSC_RTOH_TH
 523    0x7E2C    //TX_WIDE2_MEANHTH
-524    0x0000    //TX_DR_RESRV_5
-525    0x0000    //TX_DR_RESRV_6
+524    0x0064    //TX_DR_RESRV_5
+525    0x1000    //TX_DR_RESRV_6
 526    0x122E    //TX_DR_RESRV_7
 527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH

bluetooth/qti_default.mk

@@ -23,38 +23,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
-	ro.bluetooth.leaudio_switcher.supported=true \
-	ro.bluetooth.leaudio_offload.supported=true \
-	persist.bluetooth.leaudio_offload.disabled=false \
-	ro.vendor.audio_hal.ble_use_stream_id=true \
-	bluetooth.profile.bap.unicast.client.enabled?=true \
-	bluetooth.profile.csip.set_coordinator.enabled?=true \
-	bluetooth.profile.hap.client.enabled?=true \
-	bluetooth.profile.mcp.server.enabled?=true \
-	bluetooth.profile.ccp.server.enabled?=true \
-	bluetooth.profile.vcp.controller.enabled?=true \
-
-# Bluetooth LE Audio CIS handover to SCO
-# Set the property only if the controller doesn't support CIS and SCO
-# simultaneously. More details in b/242908683.
-PRODUCT_PRODUCT_PROPERTIES += \
-	persist.bluetooth.leaudio.notify.idle.during.call=true
-
-# Not support LE Audio dual mic SWB call based on the current launch strategy
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.leaudio.dual_bidirection_swb.supported=false
-
-# LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default)
-PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.leaudio.toggle_visible=false
-
-# LE Auido Offload Capabilities setting
-PRODUCT_COPY_FILES += \
-	device/google/lynx/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
-
-# LE Audio use classic connection by default
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.bluetooth.leaudio.le_audio_connection_by_default=false
+	ro.bluetooth.leaudio_switcher.supported=false \
+	bluetooth.profile.bap.unicast.client.enabled?=false \
+	bluetooth.profile.csip.set_coordinator.enabled?=false \
+	bluetooth.profile.hap.client.enabled?=false \
+	bluetooth.profile.mcp.server.enabled?=false \
+	bluetooth.profile.ccp.server.enabled?=false \
+	bluetooth.profile.vcp.controller.enabled?=false \
 
 # Bluetotoh Auto On feature
 PRODUCT_PRODUCT_PROPERTIES += \

conf/init.lynx.rc

@@ -102,6 +102,9 @@ on property:vendor.all.modules.ready=1
     chown system system /sys/bus/i2c/devices/8-0043/calibration/redc_stored
     chown system system /sys/bus/i2c/devices/8-0043/default/vibe_state
     chown system system /sys/bus/i2c/devices/8-0043/default/num_waves
+    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_bank
+    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_index
+    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_ms
     chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset
     chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space
     chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable

device-lineage.mk

@@ -21,6 +21,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     HbmSVManagerOverlayLynx
 
+# IWLAN
+PRODUCT_PACKAGES += \
+    Iwlan
+
 # wireless_charger HAL service
 include device/google/gs-common/wireless_charger/wireless_charger.mk
 

device-lynx.mk

@@ -159,8 +159,8 @@ endif
 # Vibrator HAL
 $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
+ACTUATOR_MODEL := legacy_zlra_actuator
 PRODUCT_VENDOR_PROPERTIES += \
-	ro.vendor.vibrator.hal.supported_primitives=243 \
 	ro.vendor.vibrator.hal.f0.comp.enabled=1 \
 	ro.vendor.vibrator.hal.redc.comp.enabled=0 \
 	persist.vendor.vibrator.hal.context.enable=false \
@@ -169,20 +169,36 @@ PRODUCT_VENDOR_PROPERTIES += \
 	persist.vendor.vibrator.hal.context.cooldowntime=1600 \
 	persist.vendor.vibrator.hal.context.settlingtime=5000
 
+# Override Output Distortion Gain
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.29
+
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts
 
-# GPS xml
+# Location
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+    PRODUCT_COPY_FILES += \
+        device/google/lynx/location/lhd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/lynx/location/scd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
+        PRODUCT_COPY_FILES += \
+            device/google/lynx/location/gps.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
         PRODUCT_COPY_FILES += \
-                device/google/lynx/location/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/lynx/location/lhd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/lynx/location/scd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/lynx/location/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 else
+    PRODUCT_COPY_FILES += \
+        device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+        device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
+        PRODUCT_COPY_FILES += \
+            device/google/lynx/location/gps_user.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
         PRODUCT_COPY_FILES += \
-                device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-                device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-                device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+            device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 endif
 
 # Wifi HAL
@@ -214,12 +230,30 @@ ifdef RELEASE_SVN_LYNX
 TARGET_SVN ?= $(RELEASE_SVN_LYNX)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 45
+TARGET_SVN ?= 46
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=$(TARGET_SVN)
 
+# Set device family property for SMR
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.build.device_family=P10C10L10
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+    ifneq (,$(RELEASE_BASE_OS_LYNX))
+        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_LYNX)
+    endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+    ifneq (,$(RELEASE_BASE_OS_LYNX))
+        PRODUCT_PROPERTY_OVERRIDES += \
+        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_LYNX)
+    endif
+endif
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_hide_display_cutout=true
@@ -303,3 +337,15 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.oem_id=00e0 \
     ro.quick_start.device_id=lynx
+
+# Bluetooth device id
+# Raven: 0x410B
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.device_id.product_id=16651
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif

lineage_lynx.mk

@@ -30,8 +30,8 @@ TARGET_SCREEN_WIDTH := 1080
 TARGET_HAS_UDFPS := true
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="lynx-user 15 AP3A.241105.007 12470370 release-keys" \
-    BuildFingerprint=google/lynx/lynx:15/AP3A.241105.007/12470370:user/release-keys \
+    BuildDesc="lynx-user 15 AP4A.250105.002 12701944 release-keys" \
+    BuildFingerprint=google/lynx/lynx:15/AP4A.250105.002/12701944:user/release-keys \
     DeviceProduct=$(DEVICE_CODENAME)
 
 $(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)

location/gps.6.1.xml.l10

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="true"
+       Log="JAVA"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="true"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="true"
+       ExitOnComFailure="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1"
+       MultiCarrLnaMask="L1_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4"
+       RfPathLossDb_Cp="4"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+  />
+
+</glgps>
+

location/gps.xml.l10

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
+       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        CpLppHighAccuracyShapeMode="1"
@@ -95,7 +97,10 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps_user.6.1.xml.l10

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1"
+       MultiCarrLnaMask="L1_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4"
+       RfPathLossDb_Cp="4"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="false"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+  />
+
+</glgps>
+
+

location/gps_user.xml.l10

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -94,7 +95,10 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

lynx/BoardConfig.mk

@@ -40,10 +40,17 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 
 include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk
 include device/google/lynx/sepolicy/lynx-sepolicy.mk
 include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk
 
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
+
 DEVICE_PATH := device/google/lynx
 VENDOR_PATH := vendor/google/lynx
 include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk

lynx/proprietary-files-carriersettings.txt

@@ -2,6 +2,7 @@
 product/etc/CarrierSettings/1and1_de.pb
 product/etc/CarrierSettings/2degrees_nz.pb
 product/etc/CarrierSettings/321communications_us.pb
+product/etc/CarrierSettings/48_ie.pb
 product/etc/CarrierSettings/4ka_sk.pb
 product/etc/CarrierSettings/a1_at.pb
 product/etc/CarrierSettings/a1_bg.pb
@@ -84,6 +85,7 @@ product/etc/CarrierSettings/dtac_th.pb
 product/etc/CarrierSettings/du_ae.pb
 product/etc/CarrierSettings/eastlink_ca.pb
 product/etc/CarrierSettings/ee_gb.pb
+product/etc/CarrierSettings/eeyoumobility_ca.pb
 product/etc/CarrierSettings/eir_ie.pb
 product/etc/CarrierSettings/elisa1_fi.pb
 product/etc/CarrierSettings/elisa2_fi.pb
@@ -135,7 +137,10 @@ product/etc/CarrierSettings/iliad_it.pb
 product/etc/CarrierSettings/inland_us.pb
 product/etc/CarrierSettings/iwireless_us.pb
 product/etc/CarrierSettings/jazztel_es.pb
+product/etc/CarrierSettings/jcommobile_jp.pb
+product/etc/CarrierSettings/kddi5gsa_jp.pb
 product/etc/CarrierSettings/kddi_jp.pb
+product/etc/CarrierSettings/kddimvno5gsa_jp.pb
 product/etc/CarrierSettings/kddimvno_jp.pb
 product/etc/CarrierSettings/kena_it.pb
 product/etc/CarrierSettings/koodo_ca.pb
@@ -143,6 +148,7 @@ product/etc/CarrierSettings/kpn_nl.pb
 product/etc/CarrierSettings/lebara_es.pb
 product/etc/CarrierSettings/lebara_fr.pb
 product/etc/CarrierSettings/lebara_gb.pb
+product/etc/CarrierSettings/lebara_nl.pb
 product/etc/CarrierSettings/liberty_pr.pb
 product/etc/CarrierSettings/lifecell_ua.pb
 product/etc/CarrierSettings/linemo_jp.pb
@@ -153,11 +159,14 @@ product/etc/CarrierSettings/luckymobile_ca.pb
 product/etc/CarrierSettings/lum_ca.pb
 product/etc/CarrierSettings/lyca_es.pb
 product/etc/CarrierSettings/lyca_us.pb
+product/etc/CarrierSettings/lycamobile_pt.pb
+product/etc/CarrierSettings/lycamobile_se.pb
 product/etc/CarrierSettings/m1_sg.pb
 product/etc/CarrierSettings/manxcontract_im.pb
 product/etc/CarrierSettings/manxprepaid_im.pb
 product/etc/CarrierSettings/masmovil_es.pb
 product/etc/CarrierSettings/maxis_my.pb
+product/etc/CarrierSettings/mediacom_us.pb
 product/etc/CarrierSettings/melita_mt.pb
 product/etc/CarrierSettings/meo_pt.pb
 product/etc/CarrierSettings/metropcs_us.pb
@@ -166,8 +175,12 @@ product/etc/CarrierSettings/mobily_sa.pb
 product/etc/CarrierSettings/monacotelecom_mc.pb
 product/etc/CarrierSettings/movistar_es.pb
 product/etc/CarrierSettings/movistar_mx.pb
+product/etc/CarrierSettings/mucho_ch.pb
 product/etc/CarrierSettings/mvnoconnect_us.pb
+product/etc/CarrierSettings/netcomgroup_fr.pb
+product/etc/CarrierSettings/nexphone_ch.pb
 product/etc/CarrierSettings/nextech_us.pb
+product/etc/CarrierSettings/no_sim.pb
 product/etc/CarrierSettings/nos_pt.pb
 product/etc/CarrierSettings/nova_gr.pb
 product/etc/CarrierSettings/nova_is.pb
@@ -182,6 +195,7 @@ product/etc/CarrierSettings/one_me.pb
 product/etc/CarrierSettings/onecall_no.pb
 product/etc/CarrierSettings/ooredoo_kw.pb
 product/etc/CarrierSettings/ooredoo_qa.pb
+product/etc/CarrierSettings/optimera_us.pb
 product/etc/CarrierSettings/optus_au.pb
 product/etc/CarrierSettings/orange_be.pb
 product/etc/CarrierSettings/orange_es.pb
@@ -202,6 +216,8 @@ product/etc/CarrierSettings/play_pl.pb
 product/etc/CarrierSettings/plintron_us.pb
 product/etc/CarrierSettings/plus_pl.pb
 product/etc/CarrierSettings/post_lu.pb
+product/etc/CarrierSettings/postemobile_it.pb
+product/etc/CarrierSettings/povo5gsa_jp.pb
 product/etc/CarrierSettings/povo_jp.pb
 product/etc/CarrierSettings/proximus_be.pb
 product/etc/CarrierSettings/publicmobile_ca.pb
@@ -240,17 +256,21 @@ product/etc/CarrierSettings/softbank_jp.pb
 product/etc/CarrierSettings/solomobile_ca.pb
 product/etc/CarrierSettings/spark_nz.pb
 product/etc/CarrierSettings/spectrum_us.pb
+product/etc/CarrierSettings/spectrummso_us.pb
+product/etc/CarrierSettings/spectrummsotest_us.pb
 product/etc/CarrierSettings/spmtelecom_pm.pb
 product/etc/CarrierSettings/sprint_us.pb
 product/etc/CarrierSettings/sprintprepaid_us.pb
 product/etc/CarrierSettings/sprintwholesale_us.pb
 product/etc/CarrierSettings/spusu_at.pb
+product/etc/CarrierSettings/ssimobile_ca.pb
 product/etc/CarrierSettings/starhub_sg.pb
 product/etc/CarrierSettings/stc_bh.pb
 product/etc/CarrierSettings/stc_kw.pb
 product/etc/CarrierSettings/stc_sa.pb
 product/etc/CarrierSettings/strata_us.pb
 product/etc/CarrierSettings/sunrise_ch.pb
+product/etc/CarrierSettings/superdrug_gb.pb
 product/etc/CarrierSettings/sweno_es.pb
 product/etc/CarrierSettings/swisscom_ch.pb
 product/etc/CarrierSettings/swisscom_li.pb
@@ -279,6 +299,7 @@ product/etc/CarrierSettings/telekom_pl.pb
 product/etc/CarrierSettings/telekom_ro.pb
 product/etc/CarrierSettings/telekom_si.pb
 product/etc/CarrierSettings/telekom_sk.pb
+product/etc/CarrierSettings/telemach_hr.pb
 product/etc/CarrierSettings/telemach_si.pb
 product/etc/CarrierSettings/telenet_be.pb
 product/etc/CarrierSettings/telenor_dk.pb
@@ -295,7 +316,9 @@ product/etc/CarrierSettings/tello_us.pb
 product/etc/CarrierSettings/telstra_au.pb
 product/etc/CarrierSettings/telus_ca.pb
 product/etc/CarrierSettings/tesco_gb.pb
+product/etc/CarrierSettings/test001_zz.pb
 product/etc/CarrierSettings/three_dk.pb
+product/etc/CarrierSettings/tim_br.pb
 product/etc/CarrierSettings/tim_it.pb
 product/etc/CarrierSettings/tmobile_at.pb
 product/etc/CarrierSettings/tmobile_cz.pb
@@ -322,6 +345,7 @@ product/etc/CarrierSettings/ultra_us.pb
 product/etc/CarrierSettings/umobile_my.pb
 product/etc/CarrierSettings/unifi_my.pb
 product/etc/CarrierSettings/unionwireless_us.pb
+product/etc/CarrierSettings/unitedwireless_us.pb
 product/etc/CarrierSettings/uqmobile5gsa_jp.pb
 product/etc/CarrierSettings/uqmobile_jp.pb
 product/etc/CarrierSettings/uscc_us.pb
@@ -339,6 +363,8 @@ product/etc/CarrierSettings/virgintelco_es.pb
 product/etc/CarrierSettings/visible_us.pb
 product/etc/CarrierSettings/visiblev_us.pb
 product/etc/CarrierSettings/viti_pf.pb
+product/etc/CarrierSettings/vivacom_bg.pb
+product/etc/CarrierSettings/vivo_br.pb
 product/etc/CarrierSettings/vodafone_au.pb
 product/etc/CarrierSettings/vodafone_cz.pb
 product/etc/CarrierSettings/vodafone_de.pb
@@ -356,10 +382,12 @@ product/etc/CarrierSettings/vodafone_pt.pb
 product/etc/CarrierSettings/vodafone_qa.pb
 product/etc/CarrierSettings/vodafone_ro.pb
 product/etc/CarrierSettings/vodafone_tr.pb
+product/etc/CarrierSettings/walmart_mx.pb
 product/etc/CarrierSettings/webbing_hk.pb
 product/etc/CarrierSettings/windtre_it.pb
 product/etc/CarrierSettings/xfinity2_us.pb
 product/etc/CarrierSettings/xfinity_us.pb
+product/etc/CarrierSettings/xfinitymso_us.pb
 product/etc/CarrierSettings/yes_my.pb
 product/etc/CarrierSettings/yesss_at.pb
 product/etc/CarrierSettings/yettel_bg.pb
@@ -369,3 +397,4 @@ product/etc/CarrierSettings/zain_bh.pb
 product/etc/CarrierSettings/zain_kw.pb
 product/etc/CarrierSettings/zain_sa.pb
 product/etc/CarrierSettings/zeop_re.pb
+product/etc/CarrierSettings/ztar_us.pb

lynx/proprietary-files.txt

@@ -3,8 +3,8 @@
 # product partition
 
 # AiAi
-product/priv-app/DeviceIntelligenceNetworkPrebuilt-astrea_20240329.00_RC02/DeviceIntelligenceNetworkPrebuilt-astrea_20240329.00_RC02.apk;PRESIGNED
-product/priv-app/DevicePersonalizationPrebuiltPixel2022-aiai_20240329.00_RC16/DevicePersonalizationPrebuiltPixel2022-aiai_20240329.00_RC16.apk;PRESIGNED
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2022-U.32_V.7_playstore_aiai_20240725.00_RC08/DevicePersonalizationPrebuiltPixel2022-U.32_V.7_playstore_aiai_20240725.00_RC08.apk;PRESIGNED
 
 # Audio
 product/etc/ambient/matcher_tah.leveldb
@@ -17,6 +17,11 @@ product/etc/firmware/music_detector.sound_model_tflite
 product/etc/permissions/androidx.camera.extensions.impl.xml
 product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED
 
+# Camera services
+product/etc/permissions/com.google.pixel.camera.connectivity.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.cameraidremapper.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.impl.xml
+
 # Felica
 product/etc/felica/common.cfg
 product/etc/felica/mfm.cfg
@@ -59,7 +64,7 @@ product/lib/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmengin
 product/lib/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmjavaplugin.so
 product/lib64/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmengine.so
 product/lib64/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmjavaplugin.so
-product/priv-app/CarrierSettings_signed_47.0.602606545/CarrierSettings_signed_47.0.602606545.apk;PRESIGNED
+product/priv-app/CarrierSettings_signed_49.0.645958608/CarrierSettings_signed_49.0.645958608.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -93,6 +98,16 @@ system_ext/etc/permissions/com.google.android.camerax.extensions.xml
 system_ext/framework/com.google.android.camera.extensions.jar
 system_ext/framework/com.google.android.camerax.extensions.jar
 
+# Camera services
+system_ext/app/PersistentBackgroundCameraServices/PersistentBackgroundCameraServices.apk
+system_ext/etc/permissions/com.google.pixel.camera.connectivity.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.cameraidremapper.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.xml
+system_ext/etc/vintf/manifest/[email protected]
+system_ext/framework/com.google.pixel.camera.connectivity.jar
+system_ext/framework/com.google.pixel.camera.services.cameraidremapper.jar
+system_ext/framework/com.google.pixel.camera.services.lyricconfigprovider.jar
+
 # Edge TPU
 system_ext/bin/hw/[email protected]
 system_ext/etc/init/[email protected]
@@ -121,6 +136,11 @@ system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.
 system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED
 system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED
 
+# IWLAN
+system_ext/etc/permissions/privapp-permlist_com.google.pixel.iwlan.xml
+system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml
+system_ext/priv-app/PixelIwlan/PixelIwlan.apk
+
 # Permissions
 system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml
 
@@ -144,6 +164,7 @@ system_ext/priv-app/EuiccSupportPixel/DKA_RC7_P22_EVT.in
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_P22_EVT.up
 system_ext/priv-app/EuiccSupportPixel/EuiccSupportPixel.apk;PRESIGNED
 system_ext/priv-app/EuiccSupportPixel/esim-full-ofl-v1.img
+system_ext/priv-app/EuiccSupportPixel/esim-full-v0-security.img
 system_ext/priv-app/EuiccSupportPixel/esim-full-v0.img
 system_ext/priv-app/EuiccSupportPixel/esim-full-v1.img
 system_ext/priv-app/EuiccSupportPixelPermissions/EuiccSupportPixelPermissions.apk;PRESIGNED

lynx/skip-files-vendor.txt

@@ -1,6 +1,4 @@
 # Standard build output with vendor image build enabled
-apex/com.android.hardware.biometrics.face.virtual.apex
-apex/com.android.hardware.biometrics.fingerprint.virtual.apex
 apex/com.android.hardware.cas.apex
 bin/[
 bin/acpi
@@ -42,11 +40,11 @@ bin/dump/dump_devfreq
 bin/dump/dump_display
 bin/dump/dump_fingerprint
 bin/dump/dump_gti0.sh
-bin/dump/dump_modem.sh
+bin/dump/dump_modem
 bin/dump/dump_modemlog
 bin/dump/dump_perf
 bin/dump/dump_pixel_metrics
-bin/dump/dump_power_gs201.sh
+bin/dump/dump_power
 bin/dump/dump_sensors
 bin/dump/dump_soc
 bin/dump/dump_storage
@@ -93,7 +91,7 @@ bin/hw/android.hardware.composer.hwc3-service.pixel
 bin/hw/android.hardware.drm-service.clearkey
 bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
-bin/hw/android.hardware.graphics.allocator-V1-service
+bin/hw/android.hardware.graphics.allocator-V2-service
 bin/hw/android.hardware.health-service.gs201
 bin/hw/android.hardware.health.storage-service.default
 bin/hw/android.hardware.memtrack-service.pixel
@@ -269,9 +267,9 @@ etc/a2dp_in_audio_policy_configuration_7_0.xml
 etc/aconfig_flags.pb
 etc/aidl/hfp/hfp_codec_capabilities.xml
 etc/aidl/le_audio/aidl_audio_set_configurations.bfbs
-etc/aidl/le_audio/aidl_audio_set_configurations.json
 etc/aidl/le_audio/aidl_audio_set_scenarios.bfbs
-etc/aidl/le_audio/aidl_audio_set_scenarios.json
+etc/aidl/le_audio/aidl_default_audio_set_configurations.json
+etc/aidl/le_audio/aidl_default_audio_set_scenarios.json
 etc/aoc/BLUETOOTH.dat
 etc/aoc/HANDSET.dat
 etc/aoc/HANDSFREE.dat
@@ -301,6 +299,7 @@ etc/boringssl_self_test.no_zygote.rc
 etc/boringssl_self_test.zygote32.rc
 etc/boringssl_self_test.zygote64.rc
 etc/boringssl_self_test.zygote64_32.rc
+etc/bpf/filterPowerSupplyEvents.o
 etc/build_flags.json
 etc/default_volume_tables.xml
 etc/display_colordata_cal0.pb
@@ -336,7 +335,7 @@ etc/init/[email protected]
 etc/init/android.hardware.drm-service.clearkey.rc
 etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
-etc/init/android.hardware.graphics.allocator-aidl-service.rc
+etc/init/android.hardware.graphics.allocator2-aidl-service.rc
 etc/init/android.hardware.health-service.gs201.rc
 etc/init/android.hardware.power-service.pixel-libperfmgr.rc
 etc/init/android.hardware.power.stats-service.pixel.rc
@@ -357,6 +356,7 @@ etc/init/gpu_probe.rc
 etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
 etc/init/hw/init.gs201.rc
+etc/init/hw/init.gs201.storage.rc
 etc/init/hw/init.gs201.usb.rc
 etc/init/hw/init.lynx.rc
 etc/init/hwc3-pixel.rc
@@ -376,7 +376,6 @@ etc/init/pixelstats-vendor.gs201.rc
 etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/storage.gs201.rc
 etc/init/vndservicemanager.rc
-etc/le_audio_codec_capabilities.xml
 etc/libnfc-hal-st.conf
 etc/libse-gto-hal.conf
 etc/libse-gto-hal2.conf
@@ -449,6 +448,7 @@ etc/permissions/android.software.verified_boot.xml
 etc/permissions/android.software.vulkan.deqp.level.xml
 etc/permissions/aosp_excluded_hardware.xml
 etc/permissions/com.nxp.mifare.xml
+etc/permissions/features_com.android.virt.xml
 etc/permissions/handheld_core_hardware.xml
 etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 etc/powerhint.json
@@ -498,7 +498,8 @@ etc/vintf/manifest/android.hardware.wifi.supplicant.xml
 etc/vintf/manifest/bluetooth_audio.xml
 etc/vintf/manifest/health-storage-default.xml
 etc/vintf/manifest/hwc3-default.xml
-etc/vintf/manifest/manifest_gralloc_aidl.xml
+etc/vintf/manifest/manifest.xml
+etc/vintf/manifest/manifest_gralloc_aidl2.xml
 etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/nfc-service-default.xml
 etc/vintf/manifest/pixel-display-default.xml
@@ -521,7 +522,7 @@ firmware/fast_switch1.txt
 firmware/fast_switch2.txt
 firmware/fast_switch3.txt
 firmware/fast_switch4.txt
-lib/android.hardware.audio.common-V3-ndk.so
+lib/android.hardware.audio.common-V4-ndk.so
 lib/android.hardware.audio.common-util.so
 lib/[email protected]
 lib/[email protected]
@@ -535,7 +536,7 @@ lib/[email protected]
 lib/[email protected]
 lib/[email protected]
 lib/[email protected]
-lib/android.hardware.bluetooth.audio-V4-ndk.so
+lib/android.hardware.bluetooth.audio-V5-ndk.so
 lib/android.hardware.bluetooth.audio-impl.so
 lib/[email protected]
 lib/[email protected]
@@ -557,12 +558,11 @@ lib/[email protected]
 lib/[email protected]
 lib/[email protected]
 lib/[email protected]
-lib/android.media.audio.common.types-V3-ndk.so
+lib/android.media.audio.common.types-V4-ndk.so
 lib/android.system.suspend-V1-ndk.so
 lib/arm.graphics-V1-ndk.so
 lib/hw/[email protected]
 lib/hw/[email protected]
-lib/hw/[email protected]
 lib/hw/[email protected]
 lib/hw/[email protected]
 lib/hw/audio.bluetooth.default.so
@@ -572,8 +572,10 @@ lib/hw/audio.usb.default.so
 lib/hw/audio.usbv2.default.so
 lib/hw/gralloc.default.so
 lib/hw/local_time.default.so
+lib/hw/mapper.pixel.so
 lib/hw/power.default.so
 lib/hw/vibrator.default.so
+lib/libOpenCL.so
 lib/libaconfig_storage_read_api_cc.so
 lib/libalsautils.so
 lib/libalsautilsv2.so
@@ -893,7 +895,7 @@ lib64/PixelVibratorStats.so
 lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/android.frameworks.stats-V1-ndk.so
 lib64/android.frameworks.stats-V2-ndk.so
-lib64/android.hardware.audio.common-V3-ndk.so
+lib64/android.hardware.audio.common-V4-ndk.so
 lib64/android.hardware.audio.common-util.so
 lib64/[email protected]
 lib64/[email protected]
@@ -907,7 +909,7 @@ lib64/[email protected]
 lib64/[email protected]
 lib64/[email protected]
 lib64/[email protected]
-lib64/android.hardware.bluetooth.audio-V4-ndk.so
+lib64/android.hardware.bluetooth.audio-V5-ndk.so
 lib64/android.hardware.bluetooth.audio-impl.so
 lib64/[email protected]
 lib64/[email protected]
@@ -921,9 +923,9 @@ lib64/[email protected]
 lib64/android.hardware.common-V2-ndk.so
 lib64/android.hardware.common.fmq-V1-ndk.so
 lib64/android.hardware.drm-V1-ndk.so
+lib64/android.hardware.drm.common-V1-ndk.so
 lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
-lib64/android.hardware.graphics.allocator-V1-ndk.so
 lib64/android.hardware.graphics.allocator-V2-ndk.so
 lib64/[email protected]
 lib64/[email protected]
@@ -933,7 +935,7 @@ lib64/android.hardware.graphics.common-V5-ndk.so
 lib64/[email protected]
 lib64/[email protected]
 lib64/[email protected]
-lib64/android.hardware.graphics.composer3-V3-ndk.so
+lib64/android.hardware.graphics.composer3-V4-ndk.so
 lib64/[email protected]
 lib64/[email protected]
 lib64/[email protected]
@@ -986,21 +988,20 @@ lib64/[email protected]
 lib64/android.hardware.vibrator-V2-ndk.so
 lib64/android.hardware.wifi-V2-ndk.so
 lib64/android.hardware.wifi.common-V1-ndk.so
-lib64/android.hardware.wifi.hostapd-V2-ndk.so
-lib64/android.hardware.wifi.supplicant-V3-ndk.so
+lib64/android.hardware.wifi.hostapd-V3-ndk.so
+lib64/android.hardware.wifi.supplicant-V4-ndk.so
 lib64/[email protected]
 lib64/[email protected]
 lib64/[email protected]
 lib64/[email protected]
-lib64/android.media.audio.common.types-V3-ndk.so
+lib64/android.media.audio.common.types-V4-ndk.so
 lib64/android.system.keystore2-V1-ndk.so
 lib64/android.system.suspend-V1-ndk.so
 lib64/arm.graphics-V1-ndk.so
-lib64/com.google.hardware.pixel.display-V12-ndk.so
+lib64/com.google.hardware.pixel.display-V13-ndk.so
 lib64/hw/[email protected]
 lib64/hw/[email protected]
 lib64/hw/android.hardware.graphics.allocator-aidl-impl.so
-lib64/hw/[email protected]
 lib64/hw/[email protected]
 lib64/hw/android.hardware.vibrator-impl.cs40l26.so
 lib64/hw/[email protected]
@@ -1011,9 +1012,11 @@ lib64/hw/audio.usb.default.so
 lib64/hw/audio.usbv2.default.so
 lib64/hw/gralloc.default.so
 lib64/hw/local_time.default.so
+lib64/hw/mapper.pixel.so
 lib64/hw/power.default.so
 lib64/hw/vibrator.default.so
 lib64/libExynosHWCService.so
+lib64/libOpenCL.so
 lib64/lib_android_keymaster_keymint_utils.so
 lib64/libaconfig_storage_read_api_cc.so
 lib64/libacryl.so

manifest.xml

@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>

powerhint.json

@@ -1721,18 +1721,6 @@
       "Duration": 50,
       "Value": "1"
     },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
     {
       "PowerHint": "EXPENSIVE_RENDERING",
       "Node": "PowerHALRenderingState",
@@ -1989,11 +1977,12 @@
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 15.0,
       "HeuristicBoost_On": true,
-      "HBoostOnMissedCycles": 8,
-      "HBoostOffMaxAvgRatio": 4.0,
-      "HBoostOffMissedCycles": 5,
-      "HBoostPidPuFactor": 0.5,
-      "HBoostUclampMin": 722,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
       "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
@@ -2024,11 +2013,12 @@
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 15.0,
       "HeuristicBoost_On": true,
-      "HBoostOnMissedCycles": 8,
-      "HBoostOffMaxAvgRatio": 4.0,
-      "HBoostOffMissedCycles": 5,
-      "HBoostPidPuFactor": 0.5,
-      "HBoostUclampMin": 722,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
       "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
@@ -2059,11 +2049,12 @@
       "TargetTimeFactor": 1.0,
       "StaleTimeFactor": 15.0,
       "HeuristicBoost_On": true,
-      "HBoostOnMissedCycles": 8,
-      "HBoostOffMaxAvgRatio": 4.0,
-      "HBoostOffMissedCycles": 5,
-      "HBoostPidPuFactor": 0.5,
-      "HBoostUclampMin": 722,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
       "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300

rro_overlays/NfcOverlay/res/values/config.xml

@@ -30,7 +30,7 @@
     <item>36</item>
   </integer-array>
   <integer-array name="antenna_y">
-    <item>102</item>
+    <item>48</item>
   </integer-array>
   <bool name="nfc_observe_mode_supported">true</bool>
 </resources>

sepolicy/bluetooth/hal_bluetooth_default.te

@@ -1,3 +1,5 @@
+# Bluetooth hal
+
 allow hal_bluetooth_default bt_device:chr_file rw_file_perms;
 
 add_hwservice(hal_bluetooth_default, hal_bluetooth_coexistence_hwservice)
@@ -10,3 +12,6 @@ userdebug_or_eng(`
   allow hal_bluetooth_default sscoredump_vendor_data_coredump_file:file create_file_perms;
   set_prop(hal_bluetooth_default, vendor_ssrdump_prop)
 ')
+
+set_prop(hal_bluetooth_default, vendor_bluetooth_prop)
+set_prop(vendor_init, vendor_bluetooth_prop)

sepolicy/tracking_denials/bug_map

@@ -1,2 +1,8 @@
-kernel vendor_charger_debugfs dir b/305600791
+dump_modem sscoredump_vendor_data_coredump_file dir b/361725767
+dump_modem sscoredump_vendor_data_logcat_file dir b/361725767
 hal_bluetooth_default vendor_data_file dir b/318453067
+hal_bluetooth_default vendor_default_prop property_service b/359428216
+hal_vibrator_default default_android_service service_manager b/361726059
+kernel vendor_charger_debugfs dir b/305600791
+vendor_init default_prop property_service b/359428217
+vendor_init default_prop property_service b/359428463

sepolicy/vendor/property_contexts

@@ -0,0 +1 @@
+persist.vendor.service.bdroid. u:object_r:vendor_bluetooth_prop:s0

thermal_info_config_charge_lynx.json

@@ -9,20 +9,17 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"gnss_tcxo_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -30,7 +27,6 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -38,7 +34,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -46,19 +41,16 @@
         {
             "Name":"skin_therm2",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
         {

thermal_info_config_lynx.json

@@ -9,20 +9,17 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"gnss_tcxo_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -30,7 +27,6 @@
         {
             "Name":"usb_pwr_therm2",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -38,7 +34,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", 27.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -46,19 +41,16 @@
         {
             "Name":"skin_therm2",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
         {
@@ -453,315 +445,28 @@
             "Type":"NPU",
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "Multiplier":0.001
-        },
-        {
-            "Name":"battery_cycle",
-            "Type":"BCL_VOLTAGE",
-            "Multiplier":1,
-            "Monitor":false
-        },
-        {
-            "Name":"critical-battery-cell",
-            "Type":"BCL_VOLTAGE",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
-            "Combination":["battery", "battery_cycle", "vdroop1"],
-            "Coefficient":[-10000, 400, 1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"],
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"FLASH_LED_REDUCE",
-            "Type":"UNKNOWN",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
-            "Combination":["battery", "battery_cycle", "vdroop1"],
-            "Coefficient":[-10000, 400, 1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "SendPowerHint":true
-        },
-        {
-            "Name":"soc",
-            "Type":"BCL_PERCENTAGE",
-            "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"BCL_TPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "TriggerSensor": "ocp_tpu",
-            "Combination":["ocp_tpu", "battery"],
-            "Coefficient":[1, -10],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "PassiveDelay":500,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_GPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "TriggerSensor": "ocp_gpu",
-            "Combination":["ocp_gpu", "battery"],
-            "Coefficient":[1, -10],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "PassiveDelay":500,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_GPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":["batoilo", "ocp_gpu", "battery"],
-            "Coefficient":[5000, 12000, -1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN",  3.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "PassiveDelay":500,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_TPU_LOW_TEMP",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":["batoilo", "ocp_tpu", "battery"],
-            "Coefficient":[5000, 12000, -1000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "PassiveDelay":500,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_GPU",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":["batoilo", "ocp_gpu"],
-            "Coefficient":[5000, 12000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "PassiveDelay":500,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_BATOILO_TPU",
-            "Type":"BCL_CURRENT",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "batoilo",
-            "Combination":[
-                "batoilo",
-                "ocp_tpu"
-            ],
-            "Coefficient":[5000, 12000],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true,
-            "PassiveDelay":500,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
-                }
-            ]
-        },
-        {
-            "Name":"batoilo",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                }
-            ]
-        },
-        {
-            "Name":"BCL_AUDIO_BAACL",
-            "Type":"BCL_VOLTAGE",
-            "VirtualSensor":true,
-            "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "soc",
-            "Combination":["battery", "soc"],
-            "Coefficient":[-25000, 80],
-            "HotThreshold":["NAN", "NAN",  "NAN", "NAN", 2.0, "NAN", "NAN"],
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"vdroop1",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"vdroop2",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"smpl_gm",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
-                }
-            ]
-        },
-        {
-            "Name":"ocp_cpu1",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
-        },
-        {
-            "Name":"ocp_cpu2",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Hidden":true
-        },
-        {
-            "Name":"ocp_tpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"ocp_gpu",
-            "Type":"BCL_CURRENT",
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
-            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
-            "Multiplier":1,
-            "Monitor":true
         }
     ],
     "CoolingDevices":[
         {
             "Name":"thermal-cpufreq-0",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
-            "State2Power":[1100, 1050, 1000, 950, 900, 850, 800, 750, 700, 650, 600]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
         },
         {
             "Name":"thermal-cpufreq-1",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
-            "State2Power":[1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
         },
         {
             "Name":"thermal-cpufreq-2",
             "Type":"CPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
-            "State2Power":[1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
         },
         {
             "Name":"thermal-gpufreq-0",
             "Type":"GPU",
-            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
-            "State2Power":[4599, 3727, 3259, 2378, 2044, 1813, 1449, 1223, 1007, 804, 633, 452]
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
         },
         {
             "Name":"fcc",