Merge "Fix NPE on WindowContainer#isOnTop" into rvc-dev am: e0ac89603b am: ae03bf3cd0

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

Change-Id: I2886b52441400bf23bbcc0acf5348a43f02c5b14
This commit is contained in:
Ming-Shin Lu
2020-06-18 14:41:01 +00:00
committed by Automerger Merge Worker

View File

@@ -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. */