summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tim Murray <timmurray@google.com> 2019-01-17 14:50:53 -0800
committer Tim Murray <timmurray@google.com> 2019-01-17 14:50:53 -0800
commited621cb75df54d880ba1a1649c342098ebdcc37c (patch)
tree9aa10c3797f9c6208c264b3f5803979da8149a5a
parentbbcbc2c84a9cf4a250784b3882bd2172f61fa6a8 (diff)
OomAdjuster: don't init AppCompactor in tests
Test: FrameworksServicesTests:ActivityManagerInternalTest#testNotifyNetworkPolicyRulesUpdated bug 123028785 Change-Id: I189fd4740edf9b901e0211de9bdf5fe32e7f1df6
-rw-r--r--services/core/java/com/android/server/am/OomAdjuster.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index cb4cac916f65..d0bca4e88426 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -132,8 +132,11 @@ public final class OomAdjuster {
mActiveUids = activeUids;
mLocalPowerManager = LocalServices.getService(PowerManagerInternal.class);
- mAppCompact = new AppCompactor(mService);
mConstants = mService.mConstants;
+ // mConstants can be null under test, which causes AppCompactor to crash
+ if (mConstants != null) {
+ mAppCompact = new AppCompactor(mService);
+ }
}
/**