From 419e9ec104d0f70f2dd01702d360e4b75b73eec1 Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Wed, 24 May 2023 13:40:41 -0700 Subject: [PATCH 1/3] shusky/vibrator: Enable adaptive alert vibration Enable the adaptive alert vibration feature for shusky devices. Bug: 284181186 Test: atest PtsVibratorHalTestSuite \ PtsHapticsTestCases \ VibratorHalCs40l26TestSuite \ VtsHalVibratorManagerTargetTest \ VtsHalVibratorTargetTest \ android.os.cts.VibratorTest \ android.os.cts.VibratorManagerTest \ android.os.cts.VibrationEffectTest \ android.os.cts.VibrationAttributesTest \ android.os.cts.CombinedVibrationTest Change-Id: I68d7e1d12e7ac64a0b529f26aa36a027984cfc73 Signed-off-by: Chris Paulo --- device-husky.mk | 8 +++++++- device-shiba.mk | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index efc8148..7e41574 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -304,10 +304,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 885d4ea..a710ea0 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -284,10 +284,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 += \ From a782655d545a342f2fc8b42afc1fde0a0ea3e2e7 Mon Sep 17 00:00:00 2001 From: David Chao Date: Fri, 21 Jul 2023 06:52:48 +0000 Subject: [PATCH 2/3] thermal: update powerhints for thermal trips Add switch on/off to remove dependency on powerhint.json when updating thermal thresholds Bug: 283038681 Test: Build and boot on device Change-Id: Ibf318176ba5e2c51b2989080c860560f1f1351a0 --- perf/powerhint-husky.json | 228 ++++++++-------------------------- perf/powerhint-shiba.json | 250 ++++++++------------------------------ 2 files changed, 96 insertions(+), 382 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index d288d84..f5e7562 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -448,121 +448,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 @@ -2177,75 +2117,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", @@ -2350,75 +2254,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 be39284..80e5d27 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -438,131 +438,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 @@ -2075,81 +2005,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", @@ -2254,81 +2142,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", From 067314b753df5da6ebc9e1750e17ea96439a079a Mon Sep 17 00:00:00 2001 From: Ed Lin Date: Tue, 8 Aug 2023 07:13:02 +0000 Subject: [PATCH 3/3] Update ./DevInfo/Mod model name Need to set model name to G1MNW/GKWS6 Bug: 294756539 Test: b/294756539#comment11 pass Change-Id: I0ef0a6a48beccecdc51c0b08fb2390a0483520b8 --- .../packages/apps/OMA-DM/DMService/res/values/config.xml | 8 ++++++++ .../packages/apps/OMA-DM/DMService/res/values/config.xml | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 husky/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml create mode 100644 shiba/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml 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/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 +