Merge change 4374 into donut

* changes: Fixes a potential NPE in View.
2009-06-16 15:04:37 -07:00
parent febde5fc29 779398e7eb
commit 8ad473994d
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7157,8 +7157,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
        getLocationInWindow(location);

        final AttachInfo info = mAttachInfo;
-        location[0] += info.mWindowLeft;
-        location[1] += info.mWindowTop;
+        if (info != null) {
+            location[0] += info.mWindowLeft;
+            location[1] += info.mWindowTop;
+        }
    }

    /**