Merge "Avoid the scenario where Contexts list filled with null value in ShowAnrDialogs()" into sc-v2-dev

2021-10-15 06:55:20 +00:00
parent c0541f5b04 fd53e5766e
commit 3aef71348e
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
@@ -952,7 +952,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);
                }
            }