Snap for 8333853 from cb78664adf to udc-release

Change-Id: Ibc606934867a662ff11f4ffe78a4a39550a616d5
This commit is contained in:
Android Build Coastguard Worker 2022-03-22 03:01:13 +00:00
commit 4a7d6561ae
3 changed files with 16 additions and 23 deletions

View file

@ -499,14 +499,20 @@ void DumpstateDevice::dumpThermalSection(int fd) {
"for f in /sys/class/thermal/cooling* ; do "
"type=`cat $f/type` ; temp=`cat $f/cur_state` ; echo \"$type: $temp\" ; "
"done"});
RunCommandToFd(fd, "Cooling Device User Vote State", {"/vendor/bin/sh", "-c",
"for f in /sys/class/thermal/cooling* ; do "
"if [ ! -f $f/user_vote ]; then continue; fi; "
"type=`cat $f/type` ; temp=`cat $f/user_vote` ; echo \"$type: $temp\" ; "
"done"});
RunCommandToFd(fd, "Cooling Device Time in State", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; "
"do type=`cat $f/type` ; temp=`cat $f/stats/time_in_state_ms` ; echo \"$type:\n$temp\" ; done"});
RunCommandToFd(fd, "Cooling Device Trans Table", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; "
"do type=`cat $f/type` ; temp=`cat $f/stats/trans_table` ; echo \"$type:\n$temp\" ; done"});
RunCommandToFd(fd, "Cooling Device State2Power Table", {"/vendor/bin/sh", "-c",
"for f in /sys/class/thermal/cooling* ; do "
"type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; "
"done"});
"if [ ! -f $f/state2power_table ]; then continue; fi; "
"type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; "
"done"});
DumpFileToFd(fd, "TMU state:", "/sys/module/gs_thermal/parameters/tmu_reg_dump_state");
DumpFileToFd(fd, "TMU current temperature:", "/sys/module/gs_thermal/parameters/tmu_reg_dump_current_temp");
DumpFileToFd(fd, "TMU_TOP rise thresholds:", "/sys/module/gs_thermal/parameters/tmu_top_reg_dump_rise_thres");

View file

@ -18,6 +18,8 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
<bool name="config_faceAuthDismissesKeyguard">false</bool>
<!-- Our amoled doesn't animate well. -->
<bool name="config_animateScreenLights">false</bool>
@ -251,16 +253,6 @@
<!-- Should the pinner service pin the Home application? -->
<bool name="config_pinnerHomeApp">true</bool>
<!-- Display 90Hz blacklist. Apps that do not work well when the display refreshes at 90Hz.
When these apps are visible, the display's refresh rate gets fixed to 60Hz. -->
<string-array name="config_highRefreshRateBlacklist">
<item>com.nianticlabs.pokemongo</item>
<item>com.google.android.documentsui</item>
<item>com.activision.callofduty.shooter</item>
<item>jp.konami.epjCastlevania2</item>
</string-array>
<!-- The default intensity level for alarm vibrations. See
Settings.System.ALARM_VIBRATION_INTENSITY more details on the constant values and
meanings. -->

View file

@ -221,15 +221,10 @@ void addDvfsStats(std::shared_ptr<PowerStats> p) {
cfgs.push_back({"TPU", {
std::make_pair("1066MHz", "1066000"),
std::make_pair("845MHz", "845000"),
std::make_pair("625MHz", "625000"),
std::make_pair("227MHz", "227000"),
std::make_pair("RET_SLOW", "6"),
std::make_pair("S_OFF", "5"),
std::make_pair("S_SLOW", "4"),
std::make_pair("DS_FAST", "3"),
std::make_pair("DS_SLOW", "2"),
std::make_pair("DS_OFF", "1"),
std::make_pair("OFF", "0"),
std::make_pair("627MHz", "627000"),
std::make_pair("401MHz", "401000"),
std::make_pair("226MHz", "226000"),
std::make_pair("0MHz", "0"),
}});
p->addStateResidencyDataProvider(std::make_unique<DvfsStateResidencyDataProvider>(
@ -598,8 +593,8 @@ void addTPU(std::shared_ptr<PowerStats> p) {
stateCoeffs = {
// TODO (b/197721618): Measuring the TPU power numbers
{"227000", 10},
{"625000", 20},
{"226000", 10},
{"627000", 20},
{"845000", 30},
{"1066000", 40}};