diff options
| author | 2024-06-07 13:19:03 +0000 | |
|---|---|---|
| committer | 2024-06-07 13:19:09 +0000 | |
| commit | bf8d33ed1b7d6ee97a8889059b867a56b45ef7d3 (patch) | |
| tree | 4fa9fad09a31563aca3690f2b7a0ac7cc506f20d | |
| parent | 3387119d0fa71ef09031c03b3afa94887ba212ff (diff) | |
DreamActivity is SHOW_WHEN_LOCKED
Previously DreamService was just setting the layout param
on the window, which mostly works because of special casing
for dream occluding the lockscreen.
However, that special case has some races that are already
dealt with well by the Activity attr logic (because keyguard
occlusion state is otherwise based on activity flags, not
window flags) so setting the Activity-level flag puts keyguard
in the right state earlier on.
Bug: 337917376
Change-Id: I6e7e2ff8c89035775f7f02e22f43b15d7d2a5c08
Flag: EXEMPT bugfix
Test: atest DreamManagerServiceTests
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityTaskManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 0f5b6c516909..cfd5300417b4 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -1510,7 +1510,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { a.persistableMode = ActivityInfo.PERSIST_NEVER; a.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; a.colorMode = ActivityInfo.COLOR_MODE_DEFAULT; - a.flags |= ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS; + a.flags |= ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS | ActivityInfo.FLAG_SHOW_WHEN_LOCKED; a.configChanges = 0xffffffff; if (homePanelDream()) { |