Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e58d171 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

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

am: 45ee78c0

* commit '45ee78c0':
  Fix crash when docking.

Change-Id: I3b771d5524c701989f4ec0b8afc72deb109dbea5
parents 36911682 45ee78c0

core/java/android/app/ActivityThread.java

+3 −1
Original line number Diff line number Diff line
@@ -3479,8 +3479,10 @@ public final class ActivityThread { 
                    // the decor view we have to notify the view root that the

                    // callbacks may have changed.

                    ViewRootImpl impl = decor.getViewRootImpl();

                    if (impl != null) {

                        impl.notifyChildRebuilt();

                    }

                }

                if (a.mVisibleFromClient && !a.mWindowAdded) {

                    a.mWindowAdded = true;

                    wm.addView(decor, l);