commit 86f533b473ee070c28fb02d617ba2e4aec86f0f9
author Tim Murray <timmurray@google.com> Fri Jan 18 06:48:59 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 18 06:48:59 2019 +0000
tree 6c2f06376781a1320ea9fa4b057b06ff688221fa
parent 4d1776032e9581f6ad3c1428c34e569d1764aaff
parent ed621cb75df54d880ba1a1649c342098ebdcc37c

Merge "OomAdjuster: don't init AppCompactor in tests"

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

diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index 1f9362e..dc03369 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 @@
         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);
+        }
     }
 
     /**