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

Commit 535602fe authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an... 

am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb

* commit '3ac1b0f0':
  Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339
parents a5b43a04 3ac1b0f0

core/java/android/view/ViewRoot.java

+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ public final class ViewRoot extends Handler implements ViewParent, 
            }

        }



        if (attachInfo.mRecomputeGlobalAttributes) {

        if (attachInfo.mRecomputeGlobalAttributes && host.mAttachInfo != null) {

            //Log.i(TAG, "Computing view hierarchy attributes!");

            attachInfo.mRecomputeGlobalAttributes = false;

            boolean oldScreenOn = attachInfo.mKeepScreenOn;