From ea40e9abb094496987ee40aeffc2a57edd4bbcab Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Mon, 1 Nov 2010 16:54:22 -0700
Subject: Fixed null deref when view parent null during invalidation

Change-Id: I4896b4af69f3a44351465e7524dd7b621050b415
---
 core/java/android/view/View.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

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);
-- 
cgit v1.1