From 8dd5b1e53184ed3b786dd329e12d665ae59ca3f4 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Fri, 14 Jan 2011 17:28:51 -0800
Subject: [PATCH] Prevent NPE when a View is detached without having been
 attached. Bug #3355252

Change-Id: I58e03983ccf6a27a24619ec0f49659d6d7cc0a64
---
 core/java/android/view/View.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 63a3ff04e88db..f05ef8c588cdd 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7580,8 +7580,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
             mHardwareLayer.destroy();
             mHardwareLayer = null;
         }
-        mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_MSG, this);
-        mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_RECT_MSG, this);
+
+        if (mAttachInfo != null) {
+            mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_MSG, this);
+            mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_RECT_MSG, this);
+        }
+
         mCurrentAnimation = null;
     }