Fix class initialization issue
We were getting an NPE because the superclass was
calling an overridden method on its constructor,
before the variable could be initialized.
Test: atest ScrimControllerTest
Fixes: 137665467
Fixes: 137878476
Change-Id: I8914eac86cac19d92a68a2d55d97dfcee4066ed3
(cherry picked from commit 1c72bc2151)
This commit is contained in:
@@ -77,7 +77,7 @@ public class SysuiColorExtractor extends ColorExtractor implements Dumpable,
|
||||
protected void extractWallpaperColors() {
|
||||
super.extractWallpaperColors();
|
||||
// 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;
|
||||
}
|
||||
mTonal.applyFallback(mLockColors == null ? mSystemColors : mLockColors, mNeutralColorsLock);
|
||||
|
||||
Reference in New Issue
Block a user