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

Merge "BroadcastQueue: fix subtle barrier bug."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-11-16 23:41:58 +00:00
committed by Android (Google) Code Review
parent d91cb407b4 f965a7a832
commit f2fd2ca10f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/am/BroadcastProcessQueue.java
View File

@@ -596,20 +596,21 @@ class BroadcastProcessQueue {
* barrier timestamp that are still waiting to be delivered.
*/
public boolean isBeyondBarrierLocked(@UptimeMillisLong long barrierTime) {
if (mActive != null) {
return mActive.enqueueTime > barrierTime;
}
final SomeArgs next = mPending.peekFirst();
final SomeArgs nextUrgent = mPendingUrgent.peekFirst();
final SomeArgs nextOffload = mPendingOffload.peekFirst();
// Empty queue is past any barrier
final boolean nextLater = (next == null)
// Empty records are always past any barrier
final boolean activeBeyond = (mActive == null)
|| mActive.enqueueTime > barrierTime;
final boolean nextBeyond = (next == null)
|| ((BroadcastRecord) next.arg1).enqueueTime > barrierTime;
final boolean nextUrgentLater = (nextUrgent == null)
final boolean nextUrgentBeyond = (nextUrgent == null)
|| ((BroadcastRecord) nextUrgent.arg1).enqueueTime > barrierTime;
final boolean nextOffloadLater = (nextOffload == null)
final boolean nextOffloadBeyond = (nextOffload == null)
|| ((BroadcastRecord) nextOffload.arg1).enqueueTime > barrierTime;
return nextLater && nextUrgentLater && nextOffloadLater;
return activeBeyond && nextBeyond && nextUrgentBeyond && nextOffloadBeyond;
}
public boolean isRunnable() {