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

Commit 013d0180 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21701201



Change-Id: I2d15ccb53320da67f9d0d017f1746c0f3590e656
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 827e4073 22c273d7

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");















        }