From f929a5cbb50a9d577f3a9a80d067ef86ed37de60 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Thu, 2 Mar 2023 17:07:16 -0800
Subject: [PATCH] Enforce infinite-deferral policies only with modern queue
 enabled.

Bug: 271447129
Test: manual
Change-Id: Ibaf32d4d2c376d990bc46b45482d3479f4d28c96
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 4a134eef8532d..9e6a72f702967 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -14558,7 +14558,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");
         }