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

Merge "BroadcastProcessQueue: fix wait-for-broadcast-barrier/idle"

Browse Source
This commit is contained in:
Tim Murray
2023-01-13 21:06:39 +00:00
committed by Android (Google) Code Review
parent 9106ef94f0 90bb5e565a
commit 16b26358c8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -747,7 +747,7 @@ class BroadcastProcessQueue {
* be delivered at some point in the future.
*/
public boolean isIdle() {
return !isActive() && isEmpty();
return (!isActive() && isEmpty()) || isDeferredUntilActive();
}
/**
@@ -769,7 +769,8 @@ class BroadcastProcessQueue {
final boolean nextOffloadBeyond = (nextOffload == null)
|| ((BroadcastRecord) nextOffload.arg1).enqueueTime > barrierTime;
return activeBeyond && nextBeyond && nextUrgentBeyond && nextOffloadBeyond;
return (activeBeyond && nextBeyond && nextUrgentBeyond && nextOffloadBeyond)
|| isDeferredUntilActive();
}
public boolean isRunnable() {