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

Browse Source 
am: 85e35eb118

Change-Id: I77df350f236f1c623d41ff777e3ceaef26ee09ef
This commit is contained in:
Jorim Jaggi
2019-04-08 11:05:59 -07:00
committed by android-build-merger
parent f99863ee31 85e35eb118
commit 23a9e4d20f
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) { && mLastOriginalBackgroundDrawable == mOriginalBackgroundDrawable) {
return; return;
} }
if (mBackgroundInsets.equals(Insets.NONE)) { if (mOriginalBackgroundDrawable == null || mBackgroundInsets.equals(Insets.NONE)) {
setBackground(mOriginalBackgroundDrawable); setBackground(mOriginalBackgroundDrawable);
} else { } else {
setBackground(new InsetDrawable(mOriginalBackgroundDrawable, setBackground(new InsetDrawable(mOriginalBackgroundDrawable,