Merge "Enforce infinite-deferral policies only with modern queue enabled." into udc-dev

2023-03-03 18:38:01 +00:00
parent fe9247c279 f929a5cbb5
commit 22c273d757
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -14503,7 +14503,7 @@ public class ActivityManagerService extends IActivityManager.Stub
            brOptions.setDeferUntilActive(true);
        }

-        if (ordered && brOptions != null && brOptions.isDeferUntilActive()) {
+        if (mEnableModernQueue && ordered && brOptions != null && brOptions.isDeferUntilActive()) {
            throw new IllegalArgumentException("Ordered broadcasts can't be deferred until active");
        }