From 45eb3ea667dac8d97a91781f01875148bacfe74c Mon Sep 17 00:00:00 2001
From: Filip Gruszczynski <gruszczy@google.com>
Date: Thu, 9 Jul 2015 01:06:40 +0000
Subject: [PATCH] Revert "Fix NPE when requesting outsets for detached view."

This reverts commit b010291ace13947fcc76b1a64eaa67880e15f0a6.

Change-Id: If86ce92daac9e80d5fc2e9f707d937e7c6e91a74
---
 core/java/android/view/View.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 61db7bdf578d0..aeb4ac6e00231 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -6672,11 +6672,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      * @hide
      */
     public void getOutsets(Rect outOutsetRect) {
-        if (mAttachInfo != null) {
-            outOutsetRect.set(mAttachInfo.mOutsets);
-        } else {
-            outOutsetRect.setEmpty();
-        }
+        outOutsetRect.set(mAttachInfo.mOutsets);
     }
 
     /**
@@ -13570,7 +13566,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
             }
         }
 
-        onDetachedFromWindows();
+        onDetachedFromWindow();
         onDetachedFromWindowInternal();
 
         ListenerInfo li = mListenerInfo;