From 779398e7eb462ca1562eee50a919305849582e08 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Tue, 16 Jun 2009 13:17:50 -0700
Subject: Fixes a potential NPE in View.

Calling getLocationOnScreen() before the View is attached to a window can
throw an NPE. This change simply guards against the exception.
---
 core/java/android/view/View.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'core/java/android/view')

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 0497344..ec8fd96 100644
--- 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;
+        }
     }
 
     /**
-- 
cgit v1.1