Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev am: 0cb1cc74b8 am: 8a434c8052

am: fb6e3c6b82

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

Change-Id: Icbd1cb8d0c323cd676a8953e35be7d6884c07bdd
This commit is contained in:
Dianne Hackborn
2016-05-16 22:43:39 +00:00
committed by android-build-merger

View File

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