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
Change-Id: I8914eac86cac19d92a68a2d55d97dfcee4066ed3
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);