Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ming-Shin Lu
2020-06-17 17:26:58 +00:00
committed by Android (Google) Code Review
parent a1423286b2 1a9f73878f
commit e0ac89603b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -1032,7 +1032,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
* @return Whether this child is on top of the window hierarchy. * @return Whether this child is on top of the window hierarchy.
*/ */
boolean isOnTop() { 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. */ /** Returns the top child container. */