Merge "Relax the lock in getMemoryStateForProcesses" into sc-dev

This commit is contained in:
Jing Ji
2021-07-01 00:11:45 +00:00
committed by Android (Google) Code Review

View File

@@ -15548,13 +15548,11 @@ public class ActivityManagerService extends IActivityManager.Stub
@Override
public List<ProcessMemoryState> getMemoryStateForProcesses() {
List<ProcessMemoryState> processMemoryStates = new ArrayList<>();
synchronized (mProcLock) {
synchronized (mPidsSelfLocked) {
for (int i = 0, size = mPidsSelfLocked.size(); i < size; i++) {
final ProcessRecord r = mPidsSelfLocked.valueAt(i);
processMemoryStates.add(new ProcessMemoryState(
r.uid, r.getPid(), r.processName, r.mState.getCurAdj()));
}
synchronized (mPidsSelfLocked) {
for (int i = 0, size = mPidsSelfLocked.size(); i < size; i++) {
final ProcessRecord r = mPidsSelfLocked.valueAt(i);
processMemoryStates.add(new ProcessMemoryState(
r.uid, r.getPid(), r.processName, r.mState.getCurAdj()));
}
}
return processMemoryStates;