Fix thermal throttling atoms
Adds a ThermalThrottlingSeverityStateChanged atom to replace
ThermalThrottlingStateChanged. The new atom logs per severity level and
temperature type/name.
Test: print-logs and testdrive while injecting a high temperature via
emul_temp
Bug: 119688911
Change-Id: I2fbcae36eec96bd2c484e0d85ca1617f802a79d9
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index cc15a7a..1b3bea4 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -156,7 +156,7 @@
KeyValuePairsAtom key_value_pairs_atom = 83 [(allow_from_any_uid) = true];
VibratorStateChanged vibrator_state_changed = 84;
DeferredJobStatsReported deferred_job_stats_reported = 85;
- ThermalThrottlingStateChanged thermal_throttling = 86;
+ ThermalThrottlingStateChanged thermal_throttling = 86 [deprecated=true];
BiometricAcquired biometric_acquired = 87;
BiometricAuthenticated biometric_authenticated = 88;
BiometricErrorOccurred biometric_error_occurred = 89;
@@ -270,7 +270,7 @@
HiddenApiUsed hidden_api_used = 178 [(allow_from_any_uid) = true];
StyleUIChanged style_ui_changed = 179;
PrivacyIndicatorsInteracted privacy_indicators_interacted =
- 180 [(log_from_module) = "permissioncontroller"];
+ 180 [(log_from_module) = "permissioncontroller"];
AppInstallOnExternalStorageReported app_install_on_external_storage_reported = 181;
NetworkStackReported network_stack_reported = 182 [(log_from_module) = "network_stack"];
AppMovedStorageReported app_moved_storage_reported = 183;
@@ -280,6 +280,7 @@
BluetoothClassOfDeviceReported bluetooth_class_of_device_reported = 187;
IntelligenceEventReported intelligence_event_reported =
188 [(log_from_module) = "intelligence"];
+ ThermalThrottlingSeverityStateChanged thermal_throttling_severity_state_changed = 189;
}
// Pulled events will start at field 10000.
@@ -409,6 +410,7 @@
*/
/**
+ * This atom is deprecated starting in Q. Please use ThermalThrottlingSeverityStateChanged.
* Logs when the Thermal service HAL notifies the throttling start/stop events.
*
* Logged from:
@@ -426,14 +428,7 @@
}
optional State state = 2;
- // Temperature in deci degrees celsius
optional float temperature = 3;
-
- // Severity of throttling
- optional android.os.ThrottlingSeverityEnum severity = 4;
-
- // Thermistor name
- optional string sensor_name = 5;
}
/**
@@ -2364,6 +2359,27 @@
}
/**
+ * Logs when ThermalService receives throttling events.
+ *
+ * Logged from:
+ * frameworks/base/services/core/java/com/android/server/stats/StatsCompanionService.java
+ */
+message ThermalThrottlingSeverityStateChanged {
+ // The type of temperature being reported (CPU, GPU, SKIN, etc)
+ optional android.os.TemperatureTypeEnum sensor_type = 1;
+
+ // The name of the temperature source. Eg. CPU0
+ optional string sensor_name = 2;
+
+ // Temperature in tenths of a degree C.
+ // For BCL, it is decimillivolt, decimilliamps, and percentage * 10.
+ optional int32 temperature_deci_celsius = 3;
+
+ // Relative severity of the throttling, see enum definition.
+ optional android.os.ThrottlingSeverityEnum severity = 4;
+}
+
+/**
* Logs the duration of a davey (jank of >=700ms) when it occurs
*
* Logged from: