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

* commit '3ac1b0f0d4d78568faf7616b2a8b808bdf5c4882':
  Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339
This commit is contained in:
Romain Guy
2011-01-25 13:58:08 -08:00
committed by Android Git Automerger

View File

@@ -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;