Merge "Fix class initialization issue" into qt-r1-dev (780152f3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);