Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()" am: 99e5c70ff0 am: 7f2cb4c0a5 am: 5f95d3af26

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

Change-Id: Ica8d0534ebc629da71cb219b74e9428f4ea7d6bb

1 files changed, 1 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java
index 1364c72e6275..5540cc567ed2 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -940,7 +940,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
                 final int displayId = r.getDisplayId();
                 final Context c = root.getDisplayUiContext(displayId);
 
-                if (r.mVisibleRequested && !displayContexts.contains(c)) {
+                if (c != null && r.mVisibleRequested && !displayContexts.contains(c)) {
                     displayContexts.add(c);
                 }
             }