diff options
| author | 2019-04-08 17:27:52 +0000 | |
|---|---|---|
| committer | 2019-04-08 17:27:52 +0000 | |
| commit | 85e35eb118fb2a762cf76fc1e64fcada7800520c (patch) | |
| tree | 714ec9a2a392aaabdfdb22a49c4b5775ad0d8f25 | |
| parent | ac54e30fe5f0421fa69c2333d49fd415da141e0b (diff) | |
| parent | 1ed688924305d57246fef6c983da7f050cdb4259 (diff) | |
Merge "Protect against null drawable" into qt-dev
| -rw-r--r-- | core/java/com/android/internal/policy/DecorView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index 66a63290cdbd..1c0030d20c63 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, |