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

Merge "Fix crash when docking." into nyc-dev am: 45ee78c

Browse Source 
am: 6ad9739

* commit '6ad97390a3e319e32107ebaaacb6c273211d2153':
  Fix crash when docking.

Change-Id: Ic99f5ffe1c2e49cdc6503afefa9482e9b534d0d9
This commit is contained in:
Rob Carr
2016-04-27 22:13:36 +00:00
committed by android-build-merger
parent dfd3f03ddf 6ad97390a3
commit 88df0dd3ef
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityThread.java
View File

@@ -3479,7 +3479,9 @@ public final class ActivityThread {
// the decor view we have to notify the view root that the // the decor view we have to notify the view root that the
// callbacks may have changed. // callbacks may have changed.
ViewRootImpl impl = decor.getViewRootImpl(); ViewRootImpl impl = decor.getViewRootImpl();
impl.notifyChildRebuilt(); if (impl != null) {
impl.notifyChildRebuilt();
}
} }
if (a.mVisibleFromClient && !a.mWindowAdded) { if (a.mVisibleFromClient && !a.mWindowAdded) {
a.mWindowAdded = true; a.mWindowAdded = true;