commit 311ecba9818a6b09a0061a3f3fae84043f333f40
author Robert Carr <racarr@google.com> Wed Apr 27 12:59:45 2016 -0700
committer Robert Carr <racarr@google.com> Wed Apr 27 12:59:45 2016 -0700
tree a41b58a6210a135617de814570bfb830b730510b
parent fa255f6ead7097acba8400998c47685cc3defc67

Fix crash when docking.

ViewRootImpl may be null at this point if
we didn't preserve. Sorry about the churn.

Bug: 28413589
Change-Id: Iebfd819490252b52332d94ccefbddfae160087cf

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 0764ff4..f7c0b4c 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -3479,7 +3479,9 @@
                     // 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;