commit 22c273d75749ad4ebdf9cdca701ef016e16c02ff
author Sudheer Shanka <sudheersai@google.com> Fri Mar 03 18:38:01 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 03 18:38:01 2023 +0000
tree 6c47d8afcabdf7c4ddbd5e0736238d58318fe0ed
parent fe9247c279c8c8fdbcc737271a17e927b07efdeb
parent f929a5cbb50a9d577f3a9a80d067ef86ed37de60

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

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index af9b2be..432c209 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -14503,7 +14503,7 @@
             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");
         }