summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/power/ThermalManagerService.java4
-rw-r--r--services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/power/ThermalManagerService.java b/services/core/java/com/android/server/power/ThermalManagerService.java
index 0052d4f28b93..53607880ff48 100644
--- a/services/core/java/com/android/server/power/ThermalManagerService.java
+++ b/services/core/java/com/android/server/power/ThermalManagerService.java
@@ -1709,7 +1709,7 @@ public class ThermalManagerService extends SystemService {
ArrayList<Sample> samples = mSamples.computeIfAbsent(temperature.getName(),
k -> new ArrayList<>(RING_BUFFER_SIZE));
if (samples.size() == RING_BUFFER_SIZE) {
- samples.removeFirst();
+ samples.remove(0);
}
samples.add(new Sample(now, temperature.getValue()));
}
@@ -1806,7 +1806,7 @@ public class ThermalManagerService extends SystemService {
continue;
}
- float currentTemperature = samples.getLast().temperature;
+ float currentTemperature = samples.get(0).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 6d79ae467bf0..32bbc7a618d1 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 @@ public class ThermalManagerServiceTest {
// Add some time-series data
for (int i = 1; i < 20; ++i) {
- samples.add(watcher.createSampleForTesting(1000 * i, 25.0f + 0.5f * i));
+ samples.add(0, watcher.createSampleForTesting(1000 * i, 25.0f + 0.5f * i));
}
// Now the forecast should vary depending on how far ahead we are trying to predict