Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "The uid with the newest timestamp in mPendingStartActivityUids gets the best score."

Browse Source
This commit is contained in:
Hui Yu
2022-02-15 22:31:36 +00:00
committed by Android (Google) Code Review
parent cc2ca4ba87 64a4c4ec66
commit fa7afb2d5b
2 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -5615,15 +5615,29 @@ public class ActivityManagerService extends IActivityManager.Stub
synchronized (mProcLock) {
synchronized (mPidsSelfLocked) {
int newestTimeIndex = -1;
long newestTime = Long.MIN_VALUE;
for (int i = 0; i < pids.length; i++) {
ProcessRecord pr = mPidsSelfLocked.get(pids[i]);
if (pr != null) {
final boolean isPendingTop =
mPendingStartActivityUids.isPendingTopPid(pr.uid, pids[i]);
states[i] = isPendingTop ? PROCESS_STATE_TOP : pr.mState.getCurProcState();
if (scores != null) {
scores[i] = isPendingTop
? (ProcessList.FOREGROUND_APP_ADJ - 1) : pr.mState.getCurAdj();
final long pendingTopTime =
mPendingStartActivityUids.getPendingTopPidTime(pr.uid, pids[i]);
if (pendingTopTime != PendingStartActivityUids.INVALID_TIME) {
// The uid in mPendingStartActivityUids gets the TOP process state.
states[i] = PROCESS_STATE_TOP;
if (scores != null) {
// The uid in mPendingStartActivityUids gets a better score.
scores[i] = ProcessList.FOREGROUND_APP_ADJ - 1;
}
if (pendingTopTime > newestTime) {
newestTimeIndex = i;
newestTime = pendingTopTime;
}
} else {
states[i] = pr.mState.getCurProcState();
if (scores != null) {
scores[i] = pr.mState.getCurAdj();
}
}
} else {
states[i] = PROCESS_STATE_NONEXISTENT;
@@ -5632,6 +5646,13 @@ public class ActivityManagerService extends IActivityManager.Stub
}
}
}
// The uid with the newest timestamp in mPendingStartActivityUids gets the best
// score.
if (newestTimeIndex != -1) {
if (scores != null) {
scores[newestTimeIndex] = ProcessList.FOREGROUND_APP_ADJ - 2;
}
}
}
}
}

19
services/core/java/com/android/server/am/PendingStartActivityUids.java
View File

@@ -35,6 +35,8 @@ import android.util.SparseArray;
final class PendingStartActivityUids {
static final String TAG = ActivityManagerService.TAG;
public static final long INVALID_TIME = 0;
// Key is uid, value is Pair of pid and SystemClock.elapsedRealtime() when the
// uid is added.
private final SparseArray<Pair<Integer, Long>> mPendingUids = new SparseArray();
@@ -63,13 +65,20 @@ final class PendingStartActivityUids {
}
}
synchronized boolean isPendingTopPid(int uid, int pid) {
/**
* Return the elapsedRealtime when the uid is added to the mPendingUids map.
* @param uid
* @param pid
* @return elapsedRealtime if the uid is in the mPendingUids map;
* INVALID_TIME if the uid is not in the mPendingUids map.
*/
synchronized long getPendingTopPidTime(int uid, int pid) {
long ret = INVALID_TIME;
final Pair<Integer, Long> pendingPid = mPendingUids.get(uid);
if (pendingPid != null) {
return pendingPid.first == pid;
} else {
return false;
if (pendingPid != null && pendingPid.first == pid) {
ret = pendingPid.second;
}
return ret;
}
synchronized boolean isPendingTopUid(int uid) {