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

Merge "Fix NPE when setting new LayoutTransition" into klp-dev

Browse Source
This commit is contained in:
Chet Haase
2013-08-27 19:49:28 +00:00
committed by Android (Google) Code Review
parent 6d7771b575 fee6f2b3d3
commit f1c3f28eb9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/ViewGroup.java
View File

@@ -3865,8 +3865,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
*/
public void setLayoutTransition(LayoutTransition transition) {
if (mTransition != null) {
mTransition.cancel();
mTransition.removeTransitionListener(mLayoutTransitionListener);
LayoutTransition previousTransition = mTransition;
previousTransition.cancel();
previousTransition.removeTransitionListener(mLayoutTransitionListener);
}
mTransition = transition;
if (mTransition != null) {