Merge "Protect against null drawable" into qt-dev

am: 85e35eb118 Change-Id: I77df350f236f1c623d41ff777e3ceaef26ee09ef
2019-04-08 11:05:59 -07:00
parent f99863ee31 85e35eb118
commit 23a9e4d20f
1 changed files with 1 additions and 1 deletions
--- 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,