diff options
| author | Romain Guy <romainguy@google.com> | 2011-01-25 14:07:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-25 14:07:00 -0800 |
| commit | 402ede322d2d9bcb1675dacb6106624a2db36568 (patch) | |
| tree | 589c209eed2656c8a3e930f017575348477a0e44 /core/java/android/view/ViewRoot.java | |
| parent | bfdb926d83056538796aed53a80d9cabb16dffdc (diff) | |
| parent | 535602fe5572e2a648251faf01b4dcd3649d5ede (diff) | |
am 535602fe: am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb
* commit '535602fe5572e2a648251faf01b4dcd3649d5ede':
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 25471b5eaa4b..362b62df89ec 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -898,7 +898,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; |