Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf5b5ac6 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Protect against null drawable" into qt-dev am: 85e35eb1 

am: 23a9e4d2

Change-Id: I5856f2b1a914772f290b385b2f9eb424c19740dd
parents 2588af84 23a9e4d2

core/java/com/android/internal/policy/DecorView.java

+1 −1
Original line number Diff line number Diff line
@@ -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,