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

Merge "Fix doFadingAnimationLocked in sanitized builds."

Browse Source 
am: 05284b6c6a

Change-Id: I5822b920fe1dec72f0f49af35256bfbf6d9474fa
This commit is contained in:
Ivan Lozano
2018-01-16 21:42:07 +00:00
committed by android-build-merger
parent 9f1f950c31 05284b6c6a
commit b327eb682e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/input/PointerController.cpp
View File

@@ -551,18 +551,20 @@ bool PointerController::doFadingAnimationLocked(nsecs_t timestamp) {
} }
// Animate spots that are fading out and being removed. // Animate spots that are fading out and being removed.
for (size_t i = 0; i < mLocked.spots.size(); i++) { for (size_t i = 0; i < mLocked.spots.size();) {
Spot* spot = mLocked.spots.itemAt(i); Spot* spot = mLocked.spots.itemAt(i);
if (spot->id == Spot::INVALID_ID) { if (spot->id == Spot::INVALID_ID) {
spot->alpha -= float(frameDelay) / SPOT_FADE_DURATION; spot->alpha -= float(frameDelay) / SPOT_FADE_DURATION;
if (spot->alpha <= 0) { if (spot->alpha <= 0) {
mLocked.spots.removeAt(i--); mLocked.spots.removeAt(i);
releaseSpotLocked(spot); releaseSpotLocked(spot);
continue;
} else { } else {
spot->sprite->setAlpha(spot->alpha); spot->sprite->setAlpha(spot->alpha);
keepAnimating = true; keepAnimating = true;
} }
} }
++i;
} }
return keepAnimating; return keepAnimating;
} }