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

Merge "Temperature atom: Use int instead of float." into pi-dev

Browse Source
This commit is contained in:
Tej Singh
2018-03-28 20:33:44 +00:00
committed by Android (Google) Code Review
parent 26ef7344c9 d89137ed24
commit 31c807c987
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1943,7 +1943,8 @@ message FullBatteryCapacity {
}
/**
* Pulls the temperature of various parts of the device, in Celsius.
* Pulls the temperature of various parts of the device.
* The units are tenths of a degree Celsius. Eg: 30.3C is reported as 303.
*
* Pulled from:
* frameworks/base/cmds/statsd/src/external/ResourceThermalManagerPuller.cpp
@@ -1955,6 +1956,6 @@ message Temperature {
// The name of the temperature source. Eg. CPU0
optional string sensor_name = 2;
// Temperature in degrees C.
optional float temperature_C = 3;
// Temperature in tenths of a degree C.
optional int32 temperature_dC = 3;
}

4
cmds/statsd/src/external/ResourceThermalManagerPuller.cpp vendored
View File

@@ -120,7 +120,9 @@ bool ResourceThermalManagerPuller::PullInternal(vector<shared_ptr<LogEvent>>* da
wallClockTimestampNs, elapsedTimestampNs);
ptr->write((static_cast<int>(temps[i].type)));
ptr->write(temps[i].name);
ptr->write(temps[i].currentValue);
// Convert the temperature to an int.
int32_t temp = static_cast<int>(temps[i].currentValue * 10);
ptr->write(temp);
ptr->init();
data->push_back(ptr);
}