drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add NPE check to getSystemWindowInsets

Browse Source 
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
This commit is contained in:
Justin Koh
2014-06-06 12:13:16 -07:00
parent a5de8479f4
commit eba8782a1f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/WindowInsets.java
View File

@ -87,7 +87,12 @@ public final class WindowInsets {
if (mTempRect == null) { if (mTempRect == null) {
mTempRect = new Rect(); mTempRect = new Rect();
} }
if (mSystemWindowInsets != null) {
mTempRect.set(mSystemWindowInsets); mTempRect.set(mSystemWindowInsets);
} else {
// If there were no system window insets, this is just empty.
mTempRect.setEmpty();
}
return mTempRect; return mTempRect;
} }