From c3d69a798ee7093c87e929735d43cd27a8b0b131 Mon Sep 17 00:00:00 2001
From: Filip Gruszczynski <gruszczy@google.com>
Date: Wed, 3 Jun 2015 10:32:26 -0700
Subject: DO NOT MERGE - 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: I5860d5e7c20131e2650bdb8635e9659e76205fa1
(cherry picked from commit e660d4e96a2e5ac35f2dd6e2b43c588dd7e28358)
---
 core/java/android/view/View.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index aeb4ac6e0023..1bfa85e26220 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -6672,7 +6672,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();
+        }
     }
 
     /**
-- 
cgit v1.2.3-59-g8ed1b