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

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

Browse Source 
* commit 'f1c3f28eb9e87ddc6b5a3fdc5a3553b8134aff61':
  Fix NPE when setting new LayoutTransition
This commit is contained in:
Chet Haase
2013-08-27 12:51:56 -07:00
committed by Android Git Automerger
parent 71de13128f f1c3f28eb9
commit b9a474c29b
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) {