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

Recents TV: Do not allow negative delay

Browse Source 
In rare cases, the getChildCount() has a delayed update. It enters the
for loop, and then changes to return 0. This can potentially allow
a negative delay, causing a crash.

BUG: 31933255
Change-Id: Ia245edc9fca0e1712c2af5c301bac632caed1568
This commit is contained in:
Sid Soundararajan
2016-10-05 10:30:32 -07:00
parent c65dc5529e
commit a4a4763f58
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/recents/tv/animations/HomeRecentsEnterExitAnimationHolder.java
View File

@@ -47,12 +47,13 @@ public class HomeRecentsEnterExitAnimationHolder {
public void startEnterAnimation(boolean isPipShown) { public void startEnterAnimation(boolean isPipShown) {
for(int i = 0; i < mGridView.getChildCount(); i++) { for(int i = 0; i < mGridView.getChildCount(); i++) {
TaskCardView view = (TaskCardView) mGridView.getChildAt(i); TaskCardView view = (TaskCardView) mGridView.getChildAt(i);
long delay = Math.max(mDelay * i, 0);
view.setTranslationX(-mTranslationX); view.setTranslationX(-mTranslationX);
view.animate() view.animate()
.alpha(isPipShown ? mDimAlpha : 1.0f) .alpha(isPipShown ? mDimAlpha : 1.0f)
.translationX(0) .translationX(0)
.setDuration(mDuration) .setDuration(mDuration)
.setStartDelay(mDelay * i) .setStartDelay(delay)
.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); .setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
} }
} }
@@ -60,11 +61,12 @@ public class HomeRecentsEnterExitAnimationHolder {
public void startExitAnimation(DismissRecentsToHomeAnimationStarted dismissEvent) { public void startExitAnimation(DismissRecentsToHomeAnimationStarted dismissEvent) {
for(int i = mGridView.getChildCount() - 1; i >= 0; i--) { for(int i = mGridView.getChildCount() - 1; i >= 0; i--) {
TaskCardView view = (TaskCardView) mGridView.getChildAt(i); TaskCardView view = (TaskCardView) mGridView.getChildAt(i);
long delay = Math.max(mDelay * (mGridView.getChildCount() - 1 - i), 0);
view.animate() view.animate()
.alpha(0.0f) .alpha(0.0f)
.translationXBy(-mTranslationX) .translationXBy(-mTranslationX)
.setDuration(mDuration) .setDuration(mDuration)
.setStartDelay(mDelay * (mGridView.getChildCount() - 1 - i)) .setStartDelay(delay)
.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); .setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
if(i == 0) { if(i == 0) {
view.animate().setListener(dismissEvent.getAnimationTrigger() view.animate().setListener(dismissEvent.getAnimationTrigger()