commit 45ee78c083906eca68cdade9bc98b64a83372307
author Rob Carr <racarr@google.com> Wed Apr 27 21:36:50 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 27 21:36:53 2016 +0000
tree c61c727f887eeb6865066f306ac8d029cb64871a
parent 8d887d89e8b38572c80c0db53f9bc969a3496026
parent 311ecba9818a6b09a0061a3f3fae84043f333f40

Merge "Fix crash when docking." into nyc-dev

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;