From 692a5feab998b5129be427589b77a77ef3ea2ad9 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Thu, 19 May 2016 14:11:15 -0700
Subject: [PATCH] Correctly clear resizing drawable when nulling background.

When a null window background is set, we want to use the
fallback drawable for resizing.

Bug: 28801472

Change-Id: Ia616d7aa18b0d7aa2c7081a85ce7551ecfeca5b3
---
 core/java/com/android/internal/policy/DecorView.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index bd6f3a9040c11..f5966362fdb29 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -908,7 +908,12 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
             setBackgroundDrawable(drawable);
             if (drawable != null) {
                 mResizingBackgroundDrawable = drawable;
-                drawable.getPadding(mBackgroundPadding);
+            } else {
+                mResizingBackgroundDrawable = getResizingBackgroundDrawable(
+                        getContext(), 0, mWindow.mBackgroundFallbackResource);
+            }
+            if (mResizingBackgroundDrawable != null) {
+                mResizingBackgroundDrawable.getPadding(mBackgroundPadding);
             } else {
                 mBackgroundPadding.setEmpty();
             }