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

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

Change-Id: I28bf8de72b4f6bce9210bb29fde2b3d989911c0e

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 65b065ab8eab..620c287e7b8d 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -945,7 +945,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);
                 }
             }