diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 0764ff41efaf3..f7c0b4c32bc90 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -3479,7 +3479,9 @@ public final class ActivityThread { // the decor view we have to notify the view root that the // callbacks may have changed. ViewRootImpl impl = decor.getViewRootImpl(); - impl.notifyChildRebuilt(); + if (impl != null) { + impl.notifyChildRebuilt(); + } } if (a.mVisibleFromClient && !a.mWindowAdded) { a.mWindowAdded = true;