diff options
| author | Chet Haase <chet@google.com> | 2010-11-01 16:56:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-01 16:56:15 -0700 |
| commit | c9acd7d2f06f4ba8237006ce5930f09c0922d84b (patch) | |
| tree | e9ea3364969546635d5098ce9c111a230cc5f682 /core | |
| parent | 3521e2202d76141c1c5b6db75bcc4d3cf32b4217 (diff) | |
| parent | ea40e9abb094496987ee40aeffc2a57edd4bbcab (diff) | |
| download | frameworks_base-c9acd7d2f06f4ba8237006ce5930f09c0922d84b.zip frameworks_base-c9acd7d2f06f4ba8237006ce5930f09c0922d84b.tar.gz frameworks_base-c9acd7d2f06f4ba8237006ce5930f09c0922d84b.tar.bz2 | |
Merge "Fixed null deref when view parent null during invalidation"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/View.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index ab97569..a9f0780 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6298,7 +6298,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility } final AttachInfo ai = mAttachInfo; final ViewParent p = mParent; - if (ai != null && ai.mHardwareAccelerated) { + if (p != null && ai != null && ai.mHardwareAccelerated) { // fast-track for GL-enabled applications; just invalidate the whole hierarchy // with a null dirty rect, which tells the ViewRoot to redraw everything p.invalidateChild(this, null); |