diff --git a/device-husky.mk b/device-husky.mk index 780586d..8252d38 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -330,10 +330,16 @@ PRODUCT_COPY_FILES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 +ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.222 \ - ro.vendor.vibrator.hal.loc.coeff=2.8 + ro.vendor.vibrator.hal.loc.coeff=2.8 \ + persist.vendor.vibrator.hal.context.enable=false \ + persist.vendor.vibrator.hal.context.scale=60 \ + persist.vendor.vibrator.hal.context.fade=true \ + persist.vendor.vibrator.hal.context.cooldowntime=1600 \ + persist.vendor.vibrator.hal.context.settlingtime=5000 # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 3cc02ce..543ce77 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -311,10 +311,16 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 +ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.187 \ - ro.vendor.vibrator.hal.loc.coeff=2.75 + ro.vendor.vibrator.hal.loc.coeff=2.75 \ + persist.vendor.vibrator.hal.context.enable=false \ + persist.vendor.vibrator.hal.context.scale=60 \ + persist.vendor.vibrator.hal.context.fade=true \ + persist.vendor.vibrator.hal.context.cooldowntime=1600 \ + persist.vendor.vibrator.hal.context.settlingtime=5000 # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ diff --git a/husky/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/husky/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml new file mode 100644 index 0000000..abf2f25 --- /dev/null +++ b/husky/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml @@ -0,0 +1,8 @@ + + + + + + G1MNW + diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 528f8e3..e9bbc34 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -450,121 +450,61 @@ "ResetOnInit": true }, { - "Name": "BigControlTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Name": "BigTjOffset", + "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled", "Values": [ - "95000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "MidControlTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Name": "MidTjOffset", + "Path": "/sys/devices/platform/100a0000.MID/offset_enabled", "Values": [ - "95000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "LittleControlTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Name": "LittleTjOffset", + "Path": "/sys/devices/platform/100a0000.LITTLE/offset_enabled", "Values": [ - "100000", - "85000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "G3dControlTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Name": "G3dTjOffset", + "Path": "/sys/devices/platform/100b0000.G3D/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "TpuControlTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_2_temp", + "Name": "TpuTjOffset", + "Path": "/sys/devices/platform/100b0000.TPU/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "AurControlTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_2_temp", + "Name": "AurTjOffset", + "Path": "/sys/devices/platform/100b0000.AUR/offset_enabled", "Values": [ - "85000", - "80000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "BigSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", - "Values": [ - "75000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "MidSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", - "Values": [ - "75000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "LittleSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", - "Values": [ - "75000", - "65000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "G3dSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "TpuSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "AurSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_1_temp", - "Values": [ - "65000", - "60000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false @@ -2196,75 +2136,39 @@ }, { "PowerHint": "LOW_POWER", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" + "Value": "1" }, { "PowerHint": "REFRESH_120FPS", @@ -2369,75 +2273,39 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index e4d2e10..746dc1c 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -440,131 +440,61 @@ "ResetOnInit": true }, { - "Name": "BigControlTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Name": "BigTjOffset", + "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled", "Values": [ - "90000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "MidControlTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Name": "MidTjOffset", + "Path": "/sys/devices/platform/100a0000.MID/offset_enabled", "Values": [ - "90000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "LittleControlTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Name": "LittleTjOffset", + "Path": "/sys/devices/platform/100a0000.LITTLE/offset_enabled", "Values": [ - "95000", - "85000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "G3dControlTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Name": "G3dTjOffset", + "Path": "/sys/devices/platform/100b0000.G3D/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "TpuControlTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_2_temp", + "Name": "TpuTjOffset", + "Path": "/sys/devices/platform/100b0000.TPU/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "AurControlTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_2_temp", + "Name": "AurTjOffset", + "Path": "/sys/devices/platform/100b0000.AUR/offset_enabled", "Values": [ - "85000", - "80000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "BigSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", - "Values": [ - "70000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "MidSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", - "Values": [ - "70000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "LittleSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", - "Values": [ - "70000", - "65000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "G3dSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "TpuSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "AurSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "BigEarlyThrottlingTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_4_temp", - "Values": [ - "80000", - "85000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false @@ -2094,81 +2024,39 @@ }, { "PowerHint": "LOW_POWER", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "BigEarlyThrottlingTempSet", - "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "REFRESH_120FPS", @@ -2273,81 +2161,39 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigEarlyThrottlingTempSet", - "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", diff --git a/shiba/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/shiba/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml new file mode 100644 index 0000000..8cb381c --- /dev/null +++ b/shiba/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml @@ -0,0 +1,8 @@ + + + + + + GKWS6 +