From 1ed688924305d57246fef6c983da7f050cdb4259 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Mon, 8 Apr 2019 14:51:42 +0200
Subject: [PATCH] Protect against null drawable

Test: App with no background drawable doesn't crash
Fixes: 130015147
Change-Id: I28e3605aa84240979f9a04108be98d6e3006e470
---
 core/java/com/android/internal/policy/DecorView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index 66a63290cdbd2..1c0030d20c63a 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -1214,7 +1214,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
                 && mLastOriginalBackgroundDrawable == mOriginalBackgroundDrawable) {
             return;
         }
-        if (mBackgroundInsets.equals(Insets.NONE)) {
+        if (mOriginalBackgroundDrawable == null || mBackgroundInsets.equals(Insets.NONE)) {
             setBackground(mOriginalBackgroundDrawable);
         } else {
             setBackground(new InsetDrawable(mOriginalBackgroundDrawable,