summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2010-11-01 16:54:22 -0700
committerChet Haase <chet@google.com>2010-11-01 16:54:22 -0700
commitea40e9abb094496987ee40aeffc2a57edd4bbcab (patch)
treeb7f67786623be8bf985797d4275be6ee2dcd62c1 /core
parente58a5ad04b4e181e86ae573fa3a06d141bddf63a (diff)
downloadframeworks_base-ea40e9abb094496987ee40aeffc2a57edd4bbcab.zip
frameworks_base-ea40e9abb094496987ee40aeffc2a57edd4bbcab.tar.gz
frameworks_base-ea40e9abb094496987ee40aeffc2a57edd4bbcab.tar.bz2
Fixed null deref when view parent null during invalidation
Change-Id: I4896b4af69f3a44351465e7524dd7b621050b415
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/View.java2
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);