From 12c8c244a63113612c69d4970878e6722efdaab8 Mon Sep 17 00:00:00 2001 From: Aleks Rozman Date: Sun, 8 Mar 2020 15:03:06 -0700 Subject: [PATCH] DO NOT MERGE: Resolve mBehindAlpha with mCurrentBehindAlpha fixes a build breakage, mBehindAlpha is a master thing but mCurrentBehindAlpha is a QPR1 thing BUG: 151041066 Test: Compile Change-Id: I78d767319d2ba856a9f453f71b39ddd3c96e6b9f --- .../com/android/systemui/statusbar/phone/ScrimController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index d9bb995c5da89..08ba50857fa75 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -473,9 +473,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo mCurrentBehindTint = ColorUtils.blendARGB(ScrimState.BOUNCER.getBehindTint(), mState.getBehindTint(), interpolatedFract); } - if (isNaN(mBehindAlpha) || isNaN(mInFrontAlpha)) { + if (isNaN(mCurrentBehindAlpha) || isNaN(mCurrentInFrontAlpha)) { throw new IllegalStateException("Scrim opacity is NaN for state: " + mState - + ", front: " + mInFrontAlpha + ", back: " + mBehindAlpha); + + ", front: " + mCurrentInFrontAlpha + ", back: " + mCurrentBehindAlpha); } }