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

Do not accept NaN as scrim values

Browse Source 
Scrim values are becoming NaN and causing the status bar window
to not collapse.
These are inavlid values and should not be accepted.

Bug: 150672579
Test: make
Change-Id: I8217a0fa9a08f94b98121d6584fafab1bca88b4d
Merged-In: I8217a0fa9a08f94b98121d6584fafab1bca88b4d
This commit is contained in:
Lucas Dupin
2020-03-06 11:52:04 -08:00
parent 1756b8ec84
commit 7a66c7b39c
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java
View File

@@ -16,6 +16,8 @@
package com.android.systemui.statusbar;
import static java.lang.Float.isNaN;
import android.annotation.NonNull;
import android.content.Context;
import android.graphics.Canvas;
@@ -179,6 +181,9 @@ public class ScrimView extends View {
* @param alpha Gradient alpha from 0 to 1.
*/
public void setViewAlpha(float alpha) {
if (isNaN(alpha)) {
throw new IllegalArgumentException("alpha cannot be NaN");
}
if (alpha != mViewAlpha) {
mViewAlpha = alpha;

25
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
View File

@@ -16,6 +16,8 @@
package com.android.systemui.statusbar.phone;
import static java.lang.Float.isNaN;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
@@ -261,6 +263,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
mCurrentBehindTint = state.getBehindTint();
mCurrentInFrontAlpha = state.getFrontAlpha();
mCurrentBehindAlpha = state.getBehindAlpha();
if (isNaN(mCurrentBehindAlpha) || isNaN(mCurrentInFrontAlpha)) {
throw new IllegalStateException("Scrim opacity is NaN for state: " + state + ", front: "
+ mCurrentInFrontAlpha + ", back: " + mCurrentBehindAlpha);
}
applyExpansionToAlpha();
// Scrim might acquire focus when user is navigating with a D-pad or a keyboard.
@@ -390,6 +396,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
* @param fraction From 0 to 1 where 0 means collapsed and 1 expanded.
*/
public void setPanelExpansion(float fraction) {
if (isNaN(fraction)) {
throw new IllegalArgumentException("Fraction should not be NaN");
}
if (mExpansionFraction != fraction) {
mExpansionFraction = fraction;
@@ -464,6 +473,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
mCurrentBehindTint = ColorUtils.blendARGB(ScrimState.BOUNCER.getBehindTint(),
mState.getBehindTint(), interpolatedFract);
}
if (isNaN(mBehindAlpha) || isNaN(mInFrontAlpha)) {
throw new IllegalStateException("Scrim opacity is NaN for state: " + mState
+ ", front: " + mInFrontAlpha + ", back: " + mBehindAlpha);
}
}
/**
@@ -523,6 +536,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
float newBehindAlpha = mState.getBehindAlpha();
if (mCurrentBehindAlpha != newBehindAlpha) {
mCurrentBehindAlpha = newBehindAlpha;
if (isNaN(mCurrentBehindAlpha)) {
throw new IllegalStateException("Scrim opacity is NaN for state: " + mState
+ ", back: " + mCurrentBehindAlpha);
}
updateScrims();
}
}
@@ -903,7 +920,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
pw.print(" alpha="); pw.print(mCurrentBehindAlpha);
pw.print(" tint=0x"); pw.println(Integer.toHexString(mScrimBehind.getTint()));
pw.print(" mTracking="); pw.println(mTracking);
pw.print(" mTracking="); pw.println(mTracking);
pw.print(" mExpansionFraction="); pw.println(mExpansionFraction);
}
public void setWallpaperSupportsAmbientMode(boolean wallpaperSupportsAmbientMode) {
@@ -950,6 +969,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
// in this case, back-scrim needs to be re-evaluated
if (mState == ScrimState.AOD || mState == ScrimState.PULSING) {
float newBehindAlpha = mState.getBehindAlpha();
if (isNaN(newBehindAlpha)) {
throw new IllegalStateException("Scrim opacity is NaN for state: " + mState
+ ", back: " + mCurrentBehindAlpha);
}
if (mCurrentBehindAlpha != newBehindAlpha) {
mCurrentBehindAlpha = newBehindAlpha;
updateScrims();