| commit | 6f0c50201f0be7f8eb6154aa82e890728420f40a | [log] [tgz] |
|---|---|---|
| author | David Lin <dlinls@google.com> | Mon Jun 24 06:49:06 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 24 06:49:06 2024 +0000 |
| tree | a3aea62b880466d5327b802644711d909783acaa | |
| parent | 6a9f4051bc7137065238f0f477acb8a60c3dbadf [diff] | |
| parent | 0a4add4274920fa91ea7eadb8f62bb4311623ebb [diff] |
Merge "Revert^2 "Use the latest temperature read as base for headroom calculation"" into 24D1-dev
diff --git a/services/core/java/com/android/server/power/ThermalManagerService.java b/services/core/java/com/android/server/power/ThermalManagerService.java index 5360788..cb016d8 100644 --- a/services/core/java/com/android/server/power/ThermalManagerService.java +++ b/services/core/java/com/android/server/power/ThermalManagerService.java
@@ -1806,7 +1806,7 @@ continue; } - float currentTemperature = samples.get(0).temperature; + float currentTemperature = samples.get(samples.size() - 1).temperature; if (samples.size() < MINIMUM_SAMPLE_COUNT) { // Don't try to forecast, just use the latest one we have
diff --git a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java index 32bbc7a..6d79ae4 100644 --- a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java
@@ -551,7 +551,7 @@ // Add some time-series data for (int i = 1; i < 20; ++i) { - samples.add(0, watcher.createSampleForTesting(1000 * i, 25.0f + 0.5f * i)); + samples.add(watcher.createSampleForTesting(1000 * i, 25.0f + 0.5f * i)); } // Now the forecast should vary depending on how far ahead we are trying to predict