Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1

2011-03-08 23:51:02 -08:00
parent 1250c94b50 e294d41593
commit 812dba1fca
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -609,7 +609,7 @@ public abstract class HardwareRenderer {
                        DisplayList displayList = view.getDisplayList();
                        if (displayList != null) {
                            if (canvas.drawDisplayList(displayList, mRedrawClip)) {
-                                if (mRedrawClip.isEmpty()) {
+                                if (mRedrawClip.isEmpty() || view.getParent() == null) {
                                    view.invalidate();
                                } else {
                                    view.getParent().invalidateChild(view, mRedrawClip);