Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22c273d7 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

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

parents fe9247c2 f929a5cb

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

+1 −1
Original line number Diff line number Diff line
@@ -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");















        }