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

Fix the lock annotation in ProcessList

Browse Source 
Bug: 267799126
Test: Treehugger
Change-Id: I1ba7840a508075c5ac6297b480240591b026439e
This commit is contained in:
Jing Ji
2023-02-03 13:33:26 -08:00
parent 6c69263851
commit 29a982ed58
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -3851,7 +3851,7 @@ public final class ProcessList {
return runList;
}
@GuardedBy(anyOf = {"mService", "mProfileLock"})
@GuardedBy(anyOf = {"mService", "mProcLock"})
int getLruSizeLOSP() {
return mLruProcesses.size();
}
@@ -3859,7 +3859,7 @@ public final class ProcessList {
/**
* Return the reference to the LRU list, call this function for read-only access
*/
@GuardedBy(anyOf = {"mService", "mProfileLock"})
@GuardedBy(anyOf = {"mService", "mProcLock"})
ArrayList<ProcessRecord> getLruProcessesLOSP() {
return mLruProcesses;
}
@@ -3867,7 +3867,7 @@ public final class ProcessList {
/**
* Return the reference to the LRU list, call this function for read/write access
*/
@GuardedBy({"mService", "mProfileLock"})
@GuardedBy({"mService", "mProcLock"})
ArrayList<ProcessRecord> getLruProcessesLSP() {
return mLruProcesses;
}
@@ -3876,12 +3876,12 @@ public final class ProcessList {
* For test only
*/
@VisibleForTesting
@GuardedBy({"mService", "mProfileLock"})
@GuardedBy({"mService", "mProcLock"})
void setLruProcessServiceStartLSP(int pos) {
mLruProcessServiceStart = pos;
}
@GuardedBy(anyOf = {"mService", "mProfileLock"})
@GuardedBy(anyOf = {"mService", "mProcLock"})
int getLruProcessServiceStartLOSP() {
return mLruProcessServiceStart;
}
@@ -3894,7 +3894,7 @@ public final class ProcessList {
* to most recent used ProcessRecord.
* @param callback The callback interface to accept the current ProcessRecord.
*/
@GuardedBy(anyOf = {"mService", "mProfileLock"})
@GuardedBy(anyOf = {"mService", "mProcLock"})
void forEachLruProcessesLOSP(boolean iterateForward,
@NonNull Consumer<ProcessRecord> callback) {
if (iterateForward) {
@@ -3919,7 +3919,7 @@ public final class ProcessList {
* a non-null object, the search will be halted and this object will be used
* as the return value of this search function.
*/
@GuardedBy(anyOf = {"mService", "mProfileLock"})
@GuardedBy(anyOf = {"mService", "mProcLock"})
<R> R searchEachLruProcessesLOSP(boolean iterateForward,
@NonNull Function<ProcessRecord, R> callback) {
if (iterateForward) {
@@ -3940,17 +3940,17 @@ public final class ProcessList {
return null;
}
@GuardedBy(anyOf = {"mService", "mProfileLock"})
@GuardedBy(anyOf = {"mService", "mProcLock"})
boolean isInLruListLOSP(ProcessRecord app) {
return mLruProcesses.contains(app);
}
@GuardedBy(anyOf = {"mService", "mProfileLock"})
@GuardedBy(anyOf = {"mService", "mProcLock"})
int getLruSeqLOSP() {
return mLruSeq;
}
@GuardedBy(anyOf = {"mService", "mProfileLock"})
@GuardedBy(anyOf = {"mService", "mProcLock"})
MyProcessMap getProcessNamesLOSP() {
return mProcessNames;
}