commit 8dd5b1e53184ed3b786dd329e12d665ae59ca3f4
author Romain Guy <romainguy@google.com> Fri Jan 14 17:28:51 2011 -0800
committer Romain Guy <romainguy@google.com> Fri Jan 14 17:28:51 2011 -0800
tree d9122405899b63f9bcb26aa180e4e2c26548b8c0
parent c8276990df3ac55c8cbda12919abe247132c96ea

Prevent NPE when a View is detached without having been attached.
Bug #3355252

Change-Id: I58e03983ccf6a27a24619ec0f49659d6d7cc0a64

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 63a3ff0..f05ef8c 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7580,8 +7580,12 @@
             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;
     }