diff options
| author | Romain Guy <romainguy@google.com> | 2011-01-25 13:58:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-25 13:58:08 -0800 |
| commit | 535602fe5572e2a648251faf01b4dcd3649d5ede (patch) | |
| tree | 7bdeb7813bdaedc38d261f1a8ce7bcc0ce3d337f /core/java/android/view/ViewRoot.java | |
| parent | a5b43a04921711da8fa09b4f30ff5977f8222954 (diff) | |
| parent | 3ac1b0f0d4d78568faf7616b2a8b808bdf5c4882 (diff) | |
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
Diffstat (limited to 'core/java/android/view/ViewRoot.java')
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 19d78111c1bf..68b6a8a87a7d 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -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; |