Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()"

2021-08-12 09:50:46 +00:00
parent a4d60ac1ee 895d981852
commit 99e5c70ff0
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -908,7 +908,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);
                }
            }