summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hui Yu <huiyu@google.com> 2020-07-14 19:58:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-14 19:58:06 +0000
commitf5cb5d71fc01ca58f7dc5928ad38183d82fe913f (patch)
tree2428c4e0fe89ad1eca668e8e6cfeec0f6822b470
parent9542a56d6bc4ff82e8b16916114596ff2385c3c9 (diff)
parente58fb44af5a8f32353a054efc759cc8ed0aa0e24 (diff)
Merge "Make the pending top UID's adj value slightly better than FOREGROUND_APP_ADJ." into rvc-dev am: e58fb44af5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12133296 Change-Id: I0e932e98aa5a234366161158def3b28e3c2c9f2d
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java2
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 a2f76e99810c..9994f6647699 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -6058,7 +6058,7 @@ public class ActivityManagerService extends IActivityManager.Stub
mPendingStartActivityUids.isPendingTopPid(pr.uid, pids[i]);
states[i] = isPendingTop ? PROCESS_STATE_TOP : pr.getCurProcState();
if (scores != null) {
- scores[i] = isPendingTop ? ProcessList.FOREGROUND_APP_ADJ : pr.curAdj;
+ scores[i] = isPendingTop ? (ProcessList.FOREGROUND_APP_ADJ - 1) : pr.curAdj;
}
} else {
states[i] = PROCESS_STATE_NONEXISTENT;