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

am 29711396: am 3ebcd865: Merge "Fix endTransition index out of bounds exception." into mnc-dev

Browse Source 
* commit '29711396c08aec8cde46f960aa3b3a30d4fde497':
  Fix endTransition index out of bounds exception.
This commit is contained in:
George Mount
2015-06-26 21:39:34 +00:00
committed by Android Git Automerger
parent 3c176813a9 29711396c0
commit f337641fa5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/transition/TransitionManager.java
View File

@@ -435,10 +435,11 @@ public class TransitionManager {
sPendingTransitions.remove(sceneRoot); sPendingTransitions.remove(sceneRoot);
final ArrayList<Transition> runningTransitions = getRunningTransitions().get(sceneRoot); final ArrayList<Transition> runningTransitions = getRunningTransitions().get(sceneRoot);
if (runningTransitions != null) { if (runningTransitions != null && !runningTransitions.isEmpty()) {
final int count = runningTransitions.size(); // Make a copy in case this is called by an onTransitionEnd listener
for (int i = 0; i < count; i++) { ArrayList<Transition> copy = new ArrayList(runningTransitions);
final Transition transition = runningTransitions.get(i); for (int i = copy.size() - 1; i >= 0; i--) {
final Transition transition = copy.get(i);
transition.end(); transition.end();
} }
} }