Merge "Fix NPE on WindowContainer#isOnTop" into rvc-dev

2020-06-17 17:26:58 +00:00
parent a1423286b2 1a9f73878f
commit e0ac89603b
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -1032,7 +1032,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
     * @return Whether this child is on top of the window hierarchy.
     */
    boolean isOnTop() {
-        return getParent().getTopChild() == this && getParent().isOnTop();
+        final WindowContainer parent = getParent();
+        return parent != null && parent.getTopChild() == this && parent.isOnTop();
    }

    /** Returns the top child container. */