diff --git a/audio/caiman/aidl_config/audio_policy_volumes.xml b/audio/caiman/aidl_config/audio_policy_volumes.xml index 4f24a35b..4357dadf 100644 --- a/audio/caiman/aidl_config/audio_policy_volumes.xml +++ b/audio/caiman/aidl_config/audio_policy_volumes.xml @@ -85,31 +85,31 @@ volume index from 0 to 100. - 1,-9000 - 4,-6370 - 8,-6105 - 12,-5810 - 16,-5520 - 20,-5220 - 24,-4870 - 28,-4490 - 32,-4278 - 36,-4027 - 40,-3770 - 44,-3560 - 48,-3300 - 52,-3080 - 56,-2800 - 60,-2620 - 64,-2350 - 68,-2200 - 72,-2100 - 76,-1930 - 80,-1700 - 84,-1460 - 88,-1190 - 92,-850 - 96,-510 + 1,-9999 + 4,-6350 + 8,-5940 + 12,-5587 + 16,-5222 + 20,-4923 + 24,-4602 + 28,-4299 + 32,-4027 + 36,-3789 + 40,-3548 + 44,-3292 + 48,-3004 + 52,-2699 + 56,-2389 + 60,-2154 + 64,-1941 + 68,-1744 + 72,-1555 + 76,-1374 + 80,-1070 + 84,-915 + 88,-590 + 92,-392 + 96,-194 100,0 - - + + @@ -285,7 +285,7 @@ - + @@ -436,6 +436,7 @@ + diff --git a/audio/caiman/tuning/waves/waves_preset.mps b/audio/caiman/tuning/waves/waves_preset.mps index 62a00aa7..df81eeb7 100644 Binary files a/audio/caiman/tuning/waves/waves_preset.mps and b/audio/caiman/tuning/waves/waves_preset.mps differ diff --git a/audio/komodo/aidl_config/audio_policy_volumes.xml b/audio/komodo/aidl_config/audio_policy_volumes.xml index 6bdb0d11..df28ead6 100644 --- a/audio/komodo/aidl_config/audio_policy_volumes.xml +++ b/audio/komodo/aidl_config/audio_policy_volumes.xml @@ -70,10 +70,10 @@ volume index from 0 to 100. ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> 1,-4935 - 14,-3320 - 28,-2960 - 71,-1400 - 100,0 + 14,-3220 + 28,-2910 + 71,-1450 + 100,-110 @@ -84,31 +84,31 @@ volume index from 0 to 100. - 1,-6100 - 4,-5910 - 8,-5634 - 12,-5300 - 16,-4995 - 20,-4670 - 24,-4300 - 28,-3944 - 32,-3705 - 36,-3472 - 40,-3200 - 44,-3020 - 48,-2800 - 52,-2575 - 56,-2300 - 60,-2130 - 64,-1925 - 68,-1710 - 72,-1600 - 76,-1500 - 80,-1375 - 84,-1277 - 88,-991 - 92,-741 - 96,-475 + 1,-6900 + 4,-6380 + 8,-6140 + 12,-5785 + 16,-5450 + 20,-5120 + 24,-4738 + 28,-4400 + 32,-4188 + 36,-3960 + 40,-3700 + 44,-3495 + 48,-3257 + 52,-3015 + 56,-2739 + 60,-2600 + 64,-2340 + 68,-2070 + 72,-1865 + 76,-1717 + 80,-1475 + 84,-1229 + 88,-1070 + 92,-556 + 96,-239 100,0 28,-3710 66,-2100 85,-1550 - 100,-780 + 100,-480 diff --git a/audio/komodo/tuning/bluenote/recording.gatf b/audio/komodo/tuning/bluenote/recording.gatf index 3f0af82c..e56d4323 100644 Binary files a/audio/komodo/tuning/bluenote/recording.gatf and b/audio/komodo/tuning/bluenote/recording.gatf differ diff --git a/audio/komodo/tuning/bluenote/template.xml b/audio/komodo/tuning/bluenote/template.xml index 8145ea1b..dde1524d 100644 --- a/audio/komodo/tuning/bluenote/template.xml +++ b/audio/komodo/tuning/bluenote/template.xml @@ -17,8 +17,8 @@ - - + + @@ -285,7 +285,7 @@ - + @@ -436,6 +436,7 @@ + diff --git a/audio/komodo/tuning/waves/waves_preset.mps b/audio/komodo/tuning/waves/waves_preset.mps index 619bd74d..d7b2b571 100644 Binary files a/audio/komodo/tuning/waves/waves_preset.mps and b/audio/komodo/tuning/waves/waves_preset.mps differ diff --git a/audio/tokay/aidl_config/audio_policy_volumes.xml b/audio/tokay/aidl_config/audio_policy_volumes.xml index 4f24a35b..4357dadf 100644 --- a/audio/tokay/aidl_config/audio_policy_volumes.xml +++ b/audio/tokay/aidl_config/audio_policy_volumes.xml @@ -85,31 +85,31 @@ volume index from 0 to 100. - 1,-9000 - 4,-6370 - 8,-6105 - 12,-5810 - 16,-5520 - 20,-5220 - 24,-4870 - 28,-4490 - 32,-4278 - 36,-4027 - 40,-3770 - 44,-3560 - 48,-3300 - 52,-3080 - 56,-2800 - 60,-2620 - 64,-2350 - 68,-2200 - 72,-2100 - 76,-1930 - 80,-1700 - 84,-1460 - 88,-1190 - 92,-850 - 96,-510 + 1,-9999 + 4,-6350 + 8,-5940 + 12,-5587 + 16,-5222 + 20,-4923 + 24,-4602 + 28,-4299 + 32,-4027 + 36,-3789 + 40,-3548 + 44,-3292 + 48,-3004 + 52,-2699 + 56,-2389 + 60,-2154 + 64,-1941 + 68,-1744 + 72,-1555 + 76,-1374 + 80,-1070 + 84,-915 + 88,-590 + 92,-392 + 96,-194 100,0 - - + + @@ -285,7 +285,7 @@ - + @@ -436,6 +436,7 @@ + diff --git a/audio/tokay/tuning/waves/waves_preset.mps b/audio/tokay/tuning/waves/waves_preset.mps index 62a00aa7..df81eeb7 100644 Binary files a/audio/tokay/tuning/waves/waves_preset.mps and b/audio/tokay/tuning/waves/waves_preset.mps differ diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 418af00f..bfe420ff 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -23,6 +23,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index f096fea5..4c052202 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -86,6 +86,9 @@ Chip_Configuration_RefClkControl=0x24 ## LOOK! S5400 ERD's uses NDK(2), Phones use Kyocera(1). Default set to phone (1) Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F + ## Optionally specify DXCO Inflection point temperature, #### # This will override any default value or value in Crystal type #### # Value is degrees C x 100 E.g. 2855 = 28.55 deg C diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index a9b1b66e..47453d47 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -23,6 +23,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index db8de3d0..e407c8bf 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -86,6 +86,9 @@ Chip_Configuration_RefClkControl=0x24 ## LOOK! S5400 ERD's uses NDK(2), Phones use Kyocera(1). Default set to phone (1) Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F + ## Optionally specify DXCO Inflection point temperature, #### # This will override any default value or value in Crystal type #### # Value is degrees C x 100 E.g. 2855 = 28.55 deg C diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 6ac5fedd..4ba5a9fd 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -23,6 +23,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 258b500b..bdd06866 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -86,6 +86,9 @@ Chip_Configuration_RefClkControl=0x24 ## LOOK! S5400 ERD's uses NDK(2), Phones use Kyocera(1). Default set to phone (1) Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F + ## Optionally specify DXCO Inflection point temperature, #### # This will override any default value or value in Crystal type #### # Value is degrees C x 100 E.g. 2855 = 28.55 deg C diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 17b8fc58..dd25c041 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -23,6 +23,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 258b500b..bdd06866 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -86,6 +86,9 @@ Chip_Configuration_RefClkControl=0x24 ## LOOK! S5400 ERD's uses NDK(2), Phones use Kyocera(1). Default set to phone (1) Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F + ## Optionally specify DXCO Inflection point temperature, #### # This will override any default value or value in Crystal type #### # Value is degrees C x 100 E.g. 2855 = 28.55 deg C diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 6241e570..c738a867 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -23,6 +23,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index f54be954..1ccf4135 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -86,6 +86,9 @@ Chip_Configuration_RefClkControl=0x24 ## LOOK! S5400 ERD's uses NDK(2), Phones use Kyocera(1). Default set to phone (1) Chip_Configuration_DCXO_CrystalType=0x11 +# L1 only, TODO: should remove below line to enable L5 back once b/329003269 fixed. +LocTech_Constraints = 0x603F + ## Optionally specify DXCO Inflection point temperature, #### # This will override any default value or value in Crystal type #### # Value is degrees C x 100 E.g. 2855 = 28.55 deg C diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index dd64dbc4..9be8c16a 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -292,6 +292,7 @@ "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", + "250", "0" ], "ResetOnInit": true @@ -359,9 +360,10 @@ "0-3", "4-7", "4-6", - "0-6", - "0-7" + "0-7", + "0-6" ], + "DefaultIndex": 3, "ResetOnInit": true }, { @@ -1410,6 +1412,30 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CAMUClampBoost", + "Duration": 0, + "Value": "250" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CDCpuset", + "Duration": 0, + "Value": "0-7" + }, { "PowerHint": "CAMERA_SHOT", "Node": "PMU_POLL", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index bd87fdf3..9f09f1fc 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -292,6 +292,7 @@ "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", + "250", "0" ], "ResetOnInit": true @@ -359,9 +360,10 @@ "0-3", "4-7", "4-6", - "0-6", - "0-7" + "0-7", + "0-6" ], + "DefaultIndex": 3, "ResetOnInit": true }, { @@ -1410,6 +1412,30 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CAMUClampBoost", + "Duration": 0, + "Value": "250" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CDCpuset", + "Duration": 0, + "Value": "0-7" + }, { "PowerHint": "CAMERA_SHOT", "Node": "PMU_POLL", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index dbe1c7a5..ab4e4e88 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -292,6 +292,7 @@ "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", + "250", "0" ], "ResetOnInit": true @@ -359,9 +360,10 @@ "0-3", "4-7", "4-6", - "0-6", - "0-7" + "0-7", + "0-6" ], + "DefaultIndex": 3, "ResetOnInit": true }, { @@ -1399,6 +1401,30 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CAMUClampBoost", + "Duration": 0, + "Value": "250" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CDCpuset", + "Duration": 0, + "Value": "0-7" + }, { "PowerHint": "CAMERA_SHOT", "Node": "PMU_POLL", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index dd64dbc4..9be8c16a 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -292,6 +292,7 @@ "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", + "250", "0" ], "ResetOnInit": true @@ -359,9 +360,10 @@ "0-3", "4-7", "4-6", - "0-6", - "0-7" + "0-7", + "0-6" ], + "DefaultIndex": 3, "ResetOnInit": true }, { @@ -1410,6 +1412,30 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CAMUClampBoost", + "Duration": 0, + "Value": "250" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, + { + "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", + "Node": "CDCpuset", + "Duration": 0, + "Value": "0-7" + }, { "PowerHint": "CAMERA_SHOT", "Node": "PMU_POLL",