Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03c6a660 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE on WindowContainer#isOnTop" into rvc-dev am: e0ac8960 am: ae03bf3c 

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

Change-Id: I2886b52441400bf23bbcc0acf5348a43f02c5b14
parents 69450eb4 ae03bf3c

services/core/java/com/android/server/wm/WindowContainer.java

+2 −1
Original line number Diff line number Diff line
@@ -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. */