am eba8782a: Add NPE check to getSystemWindowInsets

* commit 'eba8782a1f8412a3510fc78a71b843ef6e89bdbb': Add NPE check to getSystemWindowInsets
2014-06-09 21:12:39 +00:00
parent 2be4ddc403 eba8782a1f
commit ce8c1086fb
1 changed files with 6 additions and 1 deletions
--- 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;
    }