summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2011-01-25 12:52:58 -0800
committerRomain Guy <romainguy@google.com>2011-01-25 12:59:00 -0800
commit6e81e57b526a3e23038e365414acbb9688f8e44a (patch)
tree4874d8dbb29da91f8eb367d90eae9fc1cdd71fa4 /core/java/android
parent8d2959ddffcdee8b0c2f6387f2e2772c6df474ae (diff)
downloadframeworks_base-6e81e57b526a3e23038e365414acbb9688f8e44a.zip
frameworks_base-6e81e57b526a3e23038e365414acbb9688f8e44a.tar.gz
frameworks_base-6e81e57b526a3e23038e365414acbb9688f8e44a.tar.bz2
Prevent crash in View when gathering attributes without an AttachInfo.
Bug #3385339 Change-Id: I06b6f03721b52ab0b9d13c2fb3e133ae25d99970
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/ViewRoot.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index 19d7811..68b6a8a 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;