commit 0ca6f9534db7f536222b46bded17385a73ab8f76
author Silvia Vinyes <silviavinyes@google.com> Thu Sep 16 12:14:26 2021 +0000
committer Hung-ying Tyan <tyanh@google.com> Wed Jan 26 01:36:20 2022 +0000
tree 1ac37da79a1d9517268ccd0ff3cb36f9430cd827
parent 25d96f8d4d24a74d5f619b976e77047fb686a1cb

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

services/core/java/com/android/server/am/CachedAppOptimizer.java

diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index 6230919..583fb89 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 @@
                             } 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();