Fix system crash in Atms.notifyKeyguardFlagsChanged.
The crash happened when the external display removed during relayout and post
message to notify keyguard flags changed for updating transition on
this display, and then got NULL activiy display after message received.
Add a null check in notifyKeyguardFlagsChanged to fix this crash.
Bug: 119285175
Test: All existing tests passed.
Change-Id: I1768b1485d20973049fc92f97dcaccde31510499
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 3359eac8..791b2af 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -5657,8 +5657,12 @@
// We might change the visibilities here, so prepare an empty app transition which
// might be overridden later if we actually change visibilities.
- final DisplayWindowController dwc = mStackSupervisor.getActivityDisplay(displayId)
- .getWindowContainerController();
+ final ActivityDisplay activityDisplay =
+ mStackSupervisor.getActivityDisplay(displayId);
+ if (activityDisplay == null) {
+ return;
+ }
+ final DisplayWindowController dwc = activityDisplay.getWindowContainerController();
final boolean wasTransitionSet = dwc.getPendingAppTransition() != TRANSIT_NONE;
if (!wasTransitionSet) {
dwc.prepareAppTransition(TRANSIT_NONE, false /* alwaysKeepCurrent */);