From 0ca6f9534db7f536222b46bded17385a73ab8f76 Mon Sep 17 00:00:00 2001 From: Silvia Vinyes Date: Thu, 16 Sep 2021 12:14:26 +0000 Subject: [PATCH] Fix OOM cache app optimizer flaky test. I have run atest CachedAppOptimizerTest with 20 iterations: - original code resulted in 6/20 failures - this code resulted in 0/20 failures. Bug: 200003565 Test: atest CachedAppOptimizerTest --iterations 20 Change-Id: I63309bc04d86a020ecace1477400552d3fcbe8eb Merged-In: I63309bc04d86a020ecace1477400552d3fcbe8eb --- .../core/java/com/android/server/am/CachedAppOptimizer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index 6230919d8d2d..583fb8950ccf 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -191,7 +191,9 @@ public final class CachedAppOptimizer { } else if (KEY_COMPACT_THROTTLE_1.equals(name) || KEY_COMPACT_THROTTLE_2.equals(name) || KEY_COMPACT_THROTTLE_3.equals(name) - || KEY_COMPACT_THROTTLE_4.equals(name)) { + || KEY_COMPACT_THROTTLE_4.equals(name) + || KEY_COMPACT_THROTTLE_5.equals(name) + || KEY_COMPACT_THROTTLE_6.equals(name)) { updateCompactionThrottles(); } else if (KEY_COMPACT_STATSD_SAMPLE_RATE.equals(name)) { updateCompactStatsdSampleRate();