diff options
| author | Justin Koh <justinkoh@google.com> | 2014-06-06 12:13:16 -0700 |
|---|---|---|
| committer | Justin Koh <justinkoh@google.com> | 2014-06-09 11:31:53 -0700 |
| commit | eba8782a1f8412a3510fc78a71b843ef6e89bdbb (patch) | |
| tree | 208543f567eac80bb13d7be44ef1ccd31d160c03 /core | |
| parent | a5de8479f442b7e6f8d285db58713e42fb922798 (diff) | |
| download | frameworks_base-eba8782a1f8412a3510fc78a71b843ef6e89bdbb.zip frameworks_base-eba8782a1f8412a3510fc78a71b843ef6e89bdbb.tar.gz frameworks_base-eba8782a1f8412a3510fc78a71b843ef6e89bdbb.tar.bz2 | |
Add NPE check to getSystemWindowInsets
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/WindowInsets.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java index 294f472..57e774e 100644 --- a/core/java/android/view/WindowInsets.java +++ b/core/java/android/view/WindowInsets.java @@ -87,7 +87,12 @@ public final class WindowInsets { if (mTempRect == null) { mTempRect = new Rect(); } - mTempRect.set(mSystemWindowInsets); + if (mSystemWindowInsets != null) { + mTempRect.set(mSystemWindowInsets); + } else { + // If there were no system window insets, this is just empty. + mTempRect.setEmpty(); + } return mTempRect; } |