From d786ac91caa4f97dcb62462dcd1e44d064ead59b Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Tue, 2 May 2023 16:54:56 -0700 Subject: [PATCH 1/4] Add wakeup interrupt mapping Test: Manually inspect the output of: `dumpsys batterystats --wakeups` Bug: 271922941 Change-Id: I185b0be3b12a70bee7d40d4bfafc36b344989260 --- .../frameworks/base/core/res/res/xml/irq_device_map.xml | 6 ++++++ .../frameworks/base/core/res/res/xml/irq_device_map.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index beb5166..f36ea00 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -23,5 +23,11 @@ Wifi + + Cellular_data + + + Sensor + diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index beb5166..f36ea00 100644 --- a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -23,5 +23,11 @@ Wifi + + Cellular_data + + + Sensor + From 85d508c7b6629de00b17bd635333185b4fbe16e9 Mon Sep 17 00:00:00 2001 From: Shuibing Dai Date: Tue, 2 May 2023 13:49:05 -0700 Subject: [PATCH 2/4] Remove overlay item: country code update during setup wizard The country code updating from scan results generic case can cover setup wizard case. Bug: 279625751 Test: manually verified generic case Change-Id: I364b6f64c4d0bd5a575ca1d8e11872b22ea5ed5e --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 5 ----- panther/rro_overlays/WifiOverlay/res/values/config.xml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index fa61183..a0f0ac0 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -156,11 +156,6 @@ is when the system is in the suspended mode --> true - - true - true diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index 29a474f..daa6e49 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -156,11 +156,6 @@ is when the system is in the suspended mode --> true - - true - true From 16c067a53e70b5b1e78f5ffeb1370d34569fa520 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Tue, 21 Feb 2023 09:42:12 +0800 Subject: [PATCH 3/4] thermal: Update config for stats Bug: 259903201 Test: local build and verify stats Change-Id: Ia1b0c4d31427f1100cec23548e7a8a390179e7b1 --- thermal_info_config_cheetah.json | 42 +++++++++++++++++++++++++++++++- thermal_info_config_panther.json | 42 +++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index b7ba66c..6ef7ea7 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -833,5 +833,45 @@ "PowerSampleDelay":7000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-GNSS-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB2-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QUIET-USB2", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-NEUTRAL-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index f6caf0e..f0abf68 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -834,5 +834,45 @@ "PowerSampleDelay":7000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-QUIET-QI", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QUIET-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-NEUTRAL-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } From 0302209e61d8e4c43a26cb853c017f2a7e7343ca Mon Sep 17 00:00:00 2001 From: Nathan Kulczak Date: Thu, 27 Apr 2023 20:32:41 +0000 Subject: [PATCH 4/4] [DO NOT MERGE] vibrator: Disable PWLE capability for U Set chirp.enabled=0 so that CAP_FREQUENCY_CONTROL and CAP_COMPOSE_PWLE_EFFECTS will not be enabled. Bug: 275032416 Test: adb shell idlcli vibrator getCapabilities Change-Id: I7371f896126fdc876c43d60718baffba59aa32a1 Signed-off-by: Nathan Kulczak --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 93952fc..997f061 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -340,7 +340,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=1 \ + ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.214 \ ro.vendor.vibrator.hal.loc.coeff=2.7 diff --git a/device-panther.mk b/device-panther.mk index 0c25c51..20363ad 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -326,7 +326,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=1 \ + ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.195 \ ro.vendor.vibrator.hal.loc.coeff=2.65 # Keyboard bottom padding in dp for portrait mode and height ratio