Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 23a9e4d20f

Change-Id: I5856f2b1a914772f290b385b2f9eb424c19740dd
This commit is contained in:
Jorim Jaggi
2019-04-08 13:17:52 -07:00
committed by android-build-merger
parent 2588af8441 23a9e4d20f
commit cf5b5ac636
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/policy/DecorView.java
View File

@@ -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,