diff options
author | Dianne Hackborn <hackbod@google.com> | 2013-07-10 18:47:04 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2013-07-10 18:47:04 -0700 |
commit | 20cdcee47d10986969e7e2a53a40a6ecabae3827 (patch) | |
tree | 2d5a6ffb21e09a13605b2735ad04def3d83744b6 /services/java/com/android/server/am/ProcessRecord.java | |
parent | 8ce24f2a6817193b3514bd069c64f44354a42b7b (diff) | |
download | frameworks_base-20cdcee47d10986969e7e2a53a40a6ecabae3827.zip frameworks_base-20cdcee47d10986969e7e2a53a40a6ecabae3827.tar.gz frameworks_base-20cdcee47d10986969e7e2a53a40a6ecabae3827.tar.bz2 |
Add -c option to meminfo to dump a compact form.
Also fix a bug in FastPrintWriter where println(long) was
not printing the newline.
Change-Id: Idcb4eaab0c1ec4b992032b5e36478ef11a6533d9
Diffstat (limited to 'services/java/com/android/server/am/ProcessRecord.java')
-rw-r--r-- | services/java/com/android/server/am/ProcessRecord.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/am/ProcessRecord.java b/services/java/com/android/server/am/ProcessRecord.java index 14f4102..21a6ff0 100644 --- a/services/java/com/android/server/am/ProcessRecord.java +++ b/services/java/com/android/server/am/ProcessRecord.java @@ -465,8 +465,10 @@ final class ProcessRecord { } public int getSetAdjWithServices() { - if (setAdj >= ProcessList.CACHED_APP_MIN_ADJ && hasStartedServices) { - return ProcessList.SERVICE_B_ADJ; + if (setAdj >= ProcessList.CACHED_APP_MIN_ADJ) { + if (hasStartedServices) { + return ProcessList.SERVICE_B_ADJ; + } } return setAdj; } |