diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-06-03 17:50:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-03 17:50:44 +0000 |
| commit | 844fbff80c72771d21ddabf13de8fe91312c3cd6 (patch) | |
| tree | 55754813ab07c9c7a89c57f3a85de06b35c60a0a /core/java/android/view | |
| parent | 96e727d1e63a918039ca1b1b1c98ec23ba108247 (diff) | |
| parent | e660d4e96a2e5ac35f2dd6e2b43c588dd7e28358 (diff) | |
| download | frameworks_base-844fbff80c72771d21ddabf13de8fe91312c3cd6.zip frameworks_base-844fbff80c72771d21ddabf13de8fe91312c3cd6.tar.gz frameworks_base-844fbff80c72771d21ddabf13de8fe91312c3cd6.tar.bz2 | |
Merge "Fix NPE when requesting outsets for detached view." into mnc-dev
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/View.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 37c8100..1e92a06 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(); |