Add Null check in AppWindowToken.onDisplayChanged.
Since onDisplayChanged is through DisplayManagerGlobal.sendDisplayEvent
by message, we should check all objects if is null in onDisplayChanged
to prevent message delayed case.
Bug: 119926469
Test: All existing tests passed
Change-Id: Icf5d8b19384ee0a569b6402970a8fc0bca1c882c
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index 92944a0..52c78ce 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -1081,8 +1081,12 @@
super.onDisplayChanged(dc);
if (prevDc != null && prevDc.mFocusedApp == this) {
prevDc.setFocusedApp(null);
- if (dc.getTopStack().getTopChild().getTopChild() == this) {
- dc.setFocusedApp(this);
+ final TaskStack stack = dc.getTopStack();
+ if (stack != null) {
+ final Task task = stack.getTopChild();
+ if (task != null && task.getTopChild() == this) {
+ dc.setFocusedApp(this);
+ }
}
}
}