Revert "Fix NPE when requesting outsets for detached view."
This reverts commit b010291ace13947fcc76b1a64eaa67880e15f0a6.
Change-Id: If86ce92daac9e80d5fc2e9f707d937e7c6e91a74
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 61db7bd..aeb4ac6e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -6672,11 +6672,7 @@
* @hide
*/
public void getOutsets(Rect outOutsetRect) {
- if (mAttachInfo != null) {
- outOutsetRect.set(mAttachInfo.mOutsets);
- } else {
- outOutsetRect.setEmpty();
- }
+ outOutsetRect.set(mAttachInfo.mOutsets);
}
/**
@@ -13570,7 +13566,7 @@
}
}
- onDetachedFromWindows();
+ onDetachedFromWindow();
onDetachedFromWindowInternal();
ListenerInfo li = mListenerInfo;