From eba8782a1f8412a3510fc78a71b843ef6e89bdbb Mon Sep 17 00:00:00 2001
From: Justin Koh <justinkoh@google.com>
Date: Fri, 6 Jun 2014 12:13:16 -0700
Subject: [PATCH] Add NPE check to getSystemWindowInsets

Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
---
 core/java/android/view/WindowInsets.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java
index 294f4724c5489..57e774eb00622 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;
     }