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

Merge "Fix class initialization issue" into qt-r1-dev

Browse Source 
am: 17e4063de9

Change-Id: I7b9b3d42a6ba7b57242e4cc9b7fbe03473d0ed80
This commit is contained in:
Lucas Dupin
2019-07-19 17:39:25 -07:00
committed by android-build-merger
parent f3ba780c48 17e4063de9
commit 780152f3cb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java
View File

@@ -77,7 +77,7 @@ public class SysuiColorExtractor extends ColorExtractor implements Dumpable,
protected void extractWallpaperColors() { protected void extractWallpaperColors() {
super.extractWallpaperColors(); super.extractWallpaperColors();
// mTonal is final but this method will be invoked by the base class during its ctor. // mTonal is final but this method will be invoked by the base class during its ctor.
if (mTonal == null) { if (mTonal == null || mNeutralColorsLock == null) {
return; return;
} }
mTonal.applyFallback(mLockColors == null ? mSystemColors : mLockColors, mNeutralColorsLock); mTonal.applyFallback(mLockColors == null ? mSystemColors : mLockColors, mNeutralColorsLock);