From e660d4e96a2e5ac35f2dd6e2b43c588dd7e28358 Mon Sep 17 00:00:00 2001
From: Filip Gruszczynski <gruszczy@google.com>
Date: Wed, 3 Jun 2015 10:32:26 -0700
Subject: Fix NPE when requesting outsets for detached view.

Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
---
 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 37c8100bebb0..1e92a067a2e3 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7366,7 +7366,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      * @hide
      */
     public void getOutsets(Rect outOutsetRect) {
-        outOutsetRect.set(mAttachInfo.mOutsets);
+        if (mAttachInfo != null) {
+            outOutsetRect.set(mAttachInfo.mOutsets);
+        } else {
+            outOutsetRect.setEmpty();
+        }
     }
 
     /**
@@ -14508,7 +14512,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
             }
         }
 
-        onDetachedFromWindow();
+        onDetachedFromWindows();
         onDetachedFromWindowInternal();
 
         InputMethodManager imm = InputMethodManager.peekInstance();
-- 
cgit v1.2.3-59-g8ed1b