From dd1815574f9f157a88e0d337a603cd57db142fae Mon Sep 17 00:00:00 2001
From: Hui Yu <huiyu@google.com>
Date: Fri, 10 Jul 2020 19:11:45 -0700
Subject: [PATCH] Make the pending top UID's adj value slightly better than
 FOREGROUND_APP_ADJ.

In case the pending top UID needs to compete with an already top UID,
it needs a better adj value (which is to minus one).

Bug: 160392839, 155143386, 157180494
Test: b/160392839 CTS: CtsCameraTestCases # android.hardware.multiprocess.camera.cts.CameraEvictionTest#testBasicCamera2ActivityEvictionfailure
Change-Id: Ibe219c3e780603173ad94a16056196d66c95e2a1
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index be859069950ee..4934292edf380 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -6066,7 +6066,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;