commit 3adaac8b39be4c3354a47537f2c399c0f90d2331
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 09 20:17:35 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 09 20:17:35 2022 +0000
tree 69f2aedc77687484ef0bbb516dbc69a65336ff54
parent 26d7800efafdd16d5f8efe9db70c4671b17b99ee
parent 0ca6f9534db7f536222b46bded17385a73ab8f76

Merge "Fix OOM cache app optimizer flaky test."

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();