Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2d15ccb53320da67f9d0d017f1746c0f3590e656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sudheer Shanka
2023-03-03 19:51:05 +00:00
committed by Automerger Merge Worker
parent 827e4073f2 22c273d757
commit 013d018098
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -14503,7 +14503,7 @@ public class ActivityManagerService extends IActivityManager.Stub
brOptions.setDeferUntilActive(true); 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"); throw new IllegalArgumentException("Ordered broadcasts can't be deferred until active");
} }