Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix thermal throttling atoms" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-19 20:22:40 +00:00
committed by Android (Google) Code Review
parent d4cced9ab6 a72344993d
commit 7abea9fa92
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cmds/statsd/src/atoms.proto
View File

@@ -156,7 +156,7 @@ message Atom {
KeyValuePairsAtom key_value_pairs_atom = 83 [(allow_from_any_uid) = true]; KeyValuePairsAtom key_value_pairs_atom = 83 [(allow_from_any_uid) = true];
VibratorStateChanged vibrator_state_changed = 84; VibratorStateChanged vibrator_state_changed = 84;
DeferredJobStatsReported deferred_job_stats_reported = 85; DeferredJobStatsReported deferred_job_stats_reported = 85;
ThermalThrottlingStateChanged thermal_throttling = 86; ThermalThrottlingStateChanged thermal_throttling = 86 [deprecated=true];
BiometricAcquired biometric_acquired = 87; BiometricAcquired biometric_acquired = 87;
BiometricAuthenticated biometric_authenticated = 88; BiometricAuthenticated biometric_authenticated = 88;
BiometricErrorOccurred biometric_error_occurred = 89; BiometricErrorOccurred biometric_error_occurred = 89;
@@ -270,7 +270,7 @@ message Atom {
HiddenApiUsed hidden_api_used = 178 [(allow_from_any_uid) = true]; HiddenApiUsed hidden_api_used = 178 [(allow_from_any_uid) = true];
StyleUIChanged style_ui_changed = 179; StyleUIChanged style_ui_changed = 179;
PrivacyIndicatorsInteracted privacy_indicators_interacted = PrivacyIndicatorsInteracted privacy_indicators_interacted =
180 [(log_from_module) = "permissioncontroller"]; 180 [(log_from_module) = "permissioncontroller"];
AppInstallOnExternalStorageReported app_install_on_external_storage_reported = 181; AppInstallOnExternalStorageReported app_install_on_external_storage_reported = 181;
NetworkStackReported network_stack_reported = 182 [(log_from_module) = "network_stack"]; NetworkStackReported network_stack_reported = 182 [(log_from_module) = "network_stack"];
AppMovedStorageReported app_moved_storage_reported = 183; AppMovedStorageReported app_moved_storage_reported = 183;
@@ -280,6 +280,7 @@ message Atom {
BluetoothClassOfDeviceReported bluetooth_class_of_device_reported = 187; BluetoothClassOfDeviceReported bluetooth_class_of_device_reported = 187;
IntelligenceEventReported intelligence_event_reported = IntelligenceEventReported intelligence_event_reported =
188 [(log_from_module) = "intelligence"]; 188 [(log_from_module) = "intelligence"];
ThermalThrottlingSeverityStateChanged thermal_throttling_severity_state_changed = 189;
} }
// Pulled events will start at field 10000. // Pulled events will start at field 10000.
@@ -409,6 +410,7 @@ message KeyValuePairsAtom {
*/ */
/** /**
* This atom is deprecated starting in Q. Please use ThermalThrottlingSeverityStateChanged.
* Logs when the Thermal service HAL notifies the throttling start/stop events. * Logs when the Thermal service HAL notifies the throttling start/stop events.
* *
* Logged from: * Logged from:
@@ -426,14 +428,7 @@ message ThermalThrottlingStateChanged {
} }
optional State state = 2; optional State state = 2;
// Temperature in deci degrees celsius
optional float temperature = 3; optional float temperature = 3;
// Severity of throttling
optional android.os.ThrottlingSeverityEnum severity = 4;
// Thermistor name
optional string sensor_name = 5;
} }
/** /**
@@ -2363,6 +2358,27 @@ message BatteryCausedShutdown {
optional int32 last_recorded_micro_volt = 1; optional int32 last_recorded_micro_volt = 1;
} }
/**
* 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 * Logs the duration of a davey (jank of >=700ms) when it occurs
* *

5
services/core/java/com/android/server/stats/StatsCompanionService.java
View File

@@ -2563,9 +2563,8 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
private static final class ThermalEventListener extends IThermalEventListener.Stub { private static final class ThermalEventListener extends IThermalEventListener.Stub {
@Override @Override
public void notifyThrottling(Temperature temp) { public void notifyThrottling(Temperature temp) {
StatsLog.write(StatsLog.THERMAL_THROTTLING, temp.getType(), StatsLog.write(StatsLog.THERMAL_THROTTLING_SEVERITY_STATE_CHANGED, temp.getType(),
StatsLog.THERMAL_THROTTLING_STATE_CHANGED__STATE__UNKNOWN, temp.getName(), (int) (temp.getValue() * 10), temp.getStatus());
temp.getValue(), temp.getStatus(), temp.getName());
} }
} }