Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev

am: 0cb1cc74b8

* commit '0cb1cc74b851f995110b8231f754c9f84122c816':
  Fix issue #28794831: meminfo considers cached processes to be services

Change-Id: I2d9ab20344f982e97d91422e89e56a27420233bd
This commit is contained in:
Dianne Hackborn
2016-05-16 22:31:25 +00:00
committed by android-build-merger

View File

@@ -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",