diff options
| author | 2016-05-16 22:26:12 +0000 | |
|---|---|---|
| committer | 2016-05-16 22:26:13 +0000 | |
| commit | 0cb1cc74b851f995110b8231f754c9f84122c816 (patch) | |
| tree | bb76978f4462985f2eacf53ef9a5d57d9e458d46 | |
| parent | a0a34f6017287d466e90a27f82ff8cf4c91c0663 (diff) | |
| parent | 2ebd57ff9495aa9a341ec257fd018cbe703691de (diff) | |
Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ded65569c395..ce8537e18958 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -15280,7 +15280,7 @@ public final class ActivityManagerService extends ActivityManagerNative ProcessList.VISIBLE_APP_ADJ, ProcessList.PERCEPTIBLE_APP_ADJ, ProcessList.BACKUP_APP_ADJ, ProcessList.HEAVY_WEIGHT_APP_ADJ, ProcessList.SERVICE_ADJ, ProcessList.HOME_APP_ADJ, - ProcessList.PREVIOUS_APP_ADJ, ProcessList.SERVICE_B_ADJ, ProcessList.CACHED_APP_MAX_ADJ + ProcessList.PREVIOUS_APP_ADJ, ProcessList.SERVICE_B_ADJ, ProcessList.CACHED_APP_MIN_ADJ }; static final String[] DUMP_MEM_OOM_LABEL = new String[] { "Native", |